You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@netbeans.apache.org by "mbien (via GitHub)" <gi...@apache.org> on 2024/11/28 18:14:01 UTC
[PR] Sync delivery to master after 24-rc5 (merge conflict resolved) [netbeans]
mbien opened a new pull request, #8006:
URL: https://github.com/apache/netbeans/pull/8006
resolves the merge conflict from https://github.com/apache/netbeans/pull/8003
without having to push into delivery. Only the last merge commit was edited (spec version).
--
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
Re: [PR] Sync delivery to master after 24-rc5 (merge conflict resolved) [netbeans]
Posted by "mbien (via GitHub)" <gi...@apache.org>.
mbien commented on PR #8006:
URL: https://github.com/apache/netbeans/pull/8006#issuecomment-2506655632
i guess a way to compare this is to diff both diffs
https://github.com/apache/netbeans/pull/8003.diff
https://github.com/apache/netbeans/pull/8006.diff
```
$ diff 8003.diff 8006.diff
```
```diff
134c134
< index 7b0db0ba928e..00955b41faa0 100644
---
> index 7b0db0ba928e..3d7ce4d4ef2a 100644
142c142
< +spec.version.base=9.36.0
---
> +spec.version.base=9.38.0
```
--
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
Re: [PR] Sync delivery to master after 24-rc5 (merge conflict resolved) [netbeans]
Posted by "mbien (via GitHub)" <gi...@apache.org>.
mbien closed pull request #8006: Sync delivery to master after 24-rc5 (merge conflict resolved)
URL: https://github.com/apache/netbeans/pull/8006
--
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