You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@netbeans.apache.org by GitBox <gi...@apache.org> on 2022/09/30 07:53:45 UTC

[GitHub] [netbeans] scsynergy opened a new issue, #4707: Resolving a conflict during git rebase does not work

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.
   ![GitRebaseBug](https://user-images.githubusercontent.com/11332162/193219964-1be9bfd2-c534-4684-b471-e0c55c9413b1.png)
   
   
   ### 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: notifications-unsubscribe@netbeans.apache.org.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