You are viewing a plain text version of this content. The canonical link for it is here.

Posted to notifications@netbeans.apache.org by GitBox <gi...@apache.org> on 2020/12/31 12:31:48 UTC

[GitHub] [netbeans] matthiasblaesing commented on pull request #2626: Backport VSNetBeans fixes to 12.2 branch.

matthiasblaesing commented on pull request #2626:
URL: https://github.com/apache/netbeans/pull/2626#issuecomment-752946815


   Just as a general hint: Taking git commits and applying them to other branches is the domain of "cherry-pick". So given the above and only looking at the first 5 entries of the list, this would be the approach I suggest:
   
   ```
   git checkout release122
   git cherry-pick 2ad9135514d0 e1ceda7c0c9d 0c290b4d9703 5aca5b2cc57b ca08952ef45f 
   ```
   
   The benefit is, that git will take care of stopping at the right points if manual adjustments are necessary and can take history into account. In general the approach taken looks ok, but I can see situation where this breaks hard (binaries, rejects).


----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org

For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists