[GitHub] [netbeans] sdedic commented on pull request #5387: Resolving conflicts between master, delivery and vsnetbeans_1603

["sdedic (via GitHub)" <gi...@apache.org>]

sdedic commented on PR #5387:
URL: https://github.com/apache/netbeans/pull/5387#issuecomment-1408229720

   OK, the issue is that both changes of #5353 (now present in master and vsnetbeans_1603) AND #5363 (now present in delivery and vsnetbeans_1603) are needed IMHO in NB17 (= delivery). The correct file's content is the one in vsnetbeans_1603 branch.
   
   I've tried to patch up `master` with the cummulative changes from those commits, but even then (current) `delivery` failed to merge cleanly (done on local git fork only). 
   
   The procedure that made `git checkout master ; git merge delivery` to apply cleanly was to integrate #5388 and #5387 ... or please suggest another way.
   
   > git checkout -b master-sync17rc3 master
   git merge delivery
   # handle conflicts
   # open new PR to master
   
   should that new PR replace #5367 ?
   
   


-- 
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.

To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org

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