You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@netbeans.apache.org by "sdedic (via GitHub)" <gi...@apache.org> on 2023/01/30 08:38:13 UTC
[GitHub] [netbeans] sdedic opened a new pull request, #5387: Resolving conflicts between master, delivery and vsnetbeans_1603
sdedic opened a new pull request, #5387:
URL: https://github.com/apache/netbeans/pull/5387
This PR aims to solve conflict present in #5367, brings necessary changes from `master` to delivery first, allows `delivery` to be consistent with `vsnetbeans_1603` where the two conflicting commits were already merged and hopefully tested.
--
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
[GitHub] [netbeans] neilcsmith-net commented on pull request #5387: Resolving conflicts between master, delivery and vsnetbeans_1603
Posted by "neilcsmith-net (via GitHub)" <gi...@apache.org>.
neilcsmith-net commented on PR #5387:
URL: https://github.com/apache/netbeans/pull/5387#issuecomment-1408241853
> 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.
Yes, but there are two more files changed in #5353 ? Don't you need the new versions of `AddADBAction` and `DownloadWalletDialog` in NB17 as well?
> should that new PR replace #5367 ?
Yes. But it can't be done until after we merge #5366 , close delivery for the rc, and build / announce 17-rc3. As long as delivery has the right content before then, I can handle the sync side. And also as long as no-one touches those 3 files in master this week!
--
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
[GitHub] [netbeans] sdedic closed pull request #5387: Resolving conflicts between master, delivery and vsnetbeans_1603
Posted by "sdedic (via GitHub)" <gi...@apache.org>.
sdedic closed pull request #5387: Resolving conflicts between master, delivery and vsnetbeans_1603
URL: https://github.com/apache/netbeans/pull/5387
--
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
[GitHub] [netbeans] neilcsmith-net commented on pull request #5387: Resolving conflicts between master, delivery and vsnetbeans_1603
Posted by "neilcsmith-net (via GitHub)" <gi...@apache.org>.
neilcsmith-net commented on PR #5387:
URL: https://github.com/apache/netbeans/pull/5387#issuecomment-1408296689
Cherry pick the commits from #5353 on top of delivery, handling the conflicts, and open a PR. I'll merge that to delivery.
As long as I know the file contents in delivery are what needs to be in master, that's easy enough to handle when we're ready to sync.
--
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
[GitHub] [netbeans] sdedic commented on pull request #5387: Resolving conflicts between master, delivery and vsnetbeans_1603
Posted by "sdedic (via GitHub)" <gi...@apache.org>.
sdedic commented on PR #5387:
URL: https://github.com/apache/netbeans/pull/5387#issuecomment-1408269167
> Yes, but there are two more files changed in #5353 ? Don't you need the new versions of `AddADBAction` and `DownloadWalletDialog` in NB17 as well?
True, we DO want changes to `AddADBAction` in NB17, too. So what can I do now ?
--
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
[GitHub] [netbeans] neilcsmith-net commented on pull request #5387: Resolving conflicts between master, delivery and vsnetbeans_1603
Posted by "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
[GitHub] [netbeans] sdedic commented on pull request #5387: Resolving conflicts between master, delivery and vsnetbeans_1603
Posted by "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
[GitHub] [netbeans] sdedic commented on pull request #5387: Resolving conflicts between master, delivery and vsnetbeans_1603
Posted by "sdedic (via GitHub)" <gi...@apache.org>.
sdedic commented on PR #5387:
URL: https://github.com/apache/netbeans/pull/5387#issuecomment-1408349612
Closed in favour of #5389 -- @neilcsmith-net thanks for the guidance.
--
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