scsynergy opened a new issue, #4707: URL: https://github.com/apache/netbeans/issues/4707
### Apache NetBeans version Apache NetBeans 15 ### What happened When I resolve a conflict during a git rebase Netbeans "gets stuck" in the rebasing phase: I cannot switch the branch, error message: "Cannot checkout in the current repository state: Rebasing". I can only commit to the detached branch. I need to abort the rebase on the command line and instead do a git merge. ### How to reproduce Create a project with two conflicting branches. Git rebase one branch onto the other branch. Solve conflict(s). Press "OK" button. Note: It does not matter if the rebase is done as part of a pull request, e. g. master -> origin/master or two local branches, the result is the same.  ### Did this work correctly in an earlier version? No / Don't know ### Operating System Debian 11 bullseye ### JDK OpenJDK 64-Bit Server VM Temurin-17.0.4.1+1 (build 17.0.4.1+1, mixed mode, sharing) ### Apache NetBeans packaging Apache NetBeans binary zip ### Anything else I tried to upload a sample project for you to easily reproduce the bug, but I keep getting "Something went really wrong, and we can't process that file" - happened with tar.gz and zip file. ### Are you willing to submit a pull request? No ### Code of Conduct Yes -- 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
