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

["neilcsmith-net (via GitHub)" <gi...@apache.org>]

neilcsmith-net commented on PR #5387:
URL: https://github.com/apache/netbeans/pull/5387#issuecomment-1408216044

   This doesn't seem the right way to handle this IMO.  Either we bring all of #5353 into delivery for NB17, or we handle the conflict in a PR to master and it never lands in delivery?  Do the changes in this one file really need to be in NB17 by themselves?  And if we don't bring in everything in VSCode 16.0.301, won't you get a regression in VSCode 17?
   
   eg. one we've synced delivery to release170 and built rc3
   
   ```
   git checkout -b master-sync17rc3 master
   git merge delivery
   # handle conflicts
   # open new PR to master
   ```
   
   


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