JaroslavTulach edited a comment on pull request #2626: URL: https://github.com/apache/netbeans/pull/2626#issuecomment-753293113
Re. order: My script is using `tac` instead of `cat` to reverse the order of commits. For cherrypicking I actually tried both orders - the conflicts persist. Anyway I trust my script more than any magic that comes from `git cherry-pick`. I really want to find all commits that touch `java/java.lsp.server` and apply them again on top of `release122`. The `.rej` file that the script is deleting is: ``` diff --git a/ide/spi.debugger.ui/manifest.mf.rej b/ide/spi.debugger.ui/manifest.mf.rej new file mode 100644 index 000000000000..5718128251a1 --- /dev/null +++ b/ide/spi.debugger.ui/manifest.mf.rej @@ -0,0 +1,10 @@ +--- ide/spi.debugger.ui/manifest.mf ++++ ide/spi.debugger.ui/manifest.mf +@@ -2,6 +2,6 @@ Manifest-Version: 1.0 + OpenIDE-Module: org.netbeans.spi.debugger.ui/1 + OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/debugger/ui/Bundle.properties + OpenIDE-Module-Layer: org/netbeans/modules/debugger/resources/mf-layer.xml +-OpenIDE-Module-Specification-Version: 2.66 ++OpenIDE-Module-Specification-Version: 2.67 + OpenIDE-Module-Provides: org.netbeans.spi.debugger.ui + OpenIDE-Module-Install: org/netbeans/modules/debugger/ui/DebuggerModule.class ``` manual inspection indicates that the conflict is only in versioning. This PR's last commit (84d8a49) sets the version to `2.65.1` per Neil's suggestion. ---------------------------------------------------------------- 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: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected] For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
