mbien commented on PR #8568: URL: https://github.com/apache/netbeans/pull/8568#issuecomment-4191282019
> Tried to apply a trick mbien once told me, but that does not seem to work anymore, if something isn't working as intended, please don't force push into the PR branch. Force push is destructive. If git log doesn't show what you want it to show -> don't push. e.g the log is a bit confusing now. It seems to contain a squashed commit, but also a merge commit on top of it which adds the individual commits again (sometimes a symptom for merging in the wrong direction). Removing the merge commit does fix rebase. But: I don't know what is the latest revision. gh seems to have problems generating patch files too, since the patch contains more changes than the review tab. https://github.com/apache/netbeans/pull/8568.patch https://github.com/apache/netbeans/pull/8568/changes is this the file version we want? https://raw.githubusercontent.com/homberghp/netbeans/bae442be88e7095daef5b6269c4dace38b2deca2/java/junit.ant.ui/src/org/netbeans/modules/junit/ant/ui/AntJUnitNodeOpener.java if yes: <details> make sure git status is clean and log is at the right hash ``` $ git status On branch issue8567 nothing to commit, working tree clean $ git log --oneline bae442be8 (HEAD -> issue8567) Merge branch 'issue8567' of github.com:homberghp/netbeans into issue8567 bafc4278a solves issue8567 by correcting stack evaluation ... ``` now remove the merge commit and rebase again: ``` $ git reset HEAD^ $ git pull --rebase --autostash [email protected]:apache/netbeans master ``` ``` $ git log --oneline 4ef82f7b3 (HEAD -> issue8567) solves issue8567 by correcting stack evaluation 4d933a732 (origin/master, master) Merge pull request #9319 from mbien/ci-remove-graalvm-job ``` the file is now identical to https://raw.githubusercontent.com/homberghp/netbeans/bae442be88e7095daef5b6269c4dace38b2deca2/java/junit.ant.ui/src/org/netbeans/modules/junit/ant/ui/AntJUnitNodeOpener.java and the commit is on top of the master hash. Now you may force push like you did before. </details> -- 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: [email protected] 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
