matthiasblaesing edited a comment on pull request #2626: URL: https://github.com/apache/netbeans/pull/2626#issuecomment-753283108
Ähm - you are actively deleteing rejects: find . | grep rej$ | xargs rm I have some serious doubts, that that is a good idea. And the question is: If there are merge conflicts: Why are they there? Where are the differing commits? ---------------------- Yes the merge commits are a problem, because cherry-pick applies the changes, but merge pulls two branches together, which branch should cherry-pick as a basis for the merge? This is the reason I like to cleanup after doing a messy PR and compress the 17 intermediate commits into one or two meaning full commits, that makes it much easier to deal with history changes like this. But you can work around that by specifying the commits from the branches you merged, that is already the case here: ``` 887f6b6446a6 Merge pull request #2554 from jlahoda/fix-java.lsp.server-tests ``` merged ``` a3101ebbb48e Fixing java/java.lsp.server tests. ``` ---------------------- For the huge number of conflicts, I suspect the problem is, that the order of the commits is reversed. The first entry in your list is the most recent, while cherry-pick needs the "right" order or commits. ---------------------------------------------------------------- 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
