-
Notifications
You must be signed in to change notification settings - Fork 28.9k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Git: Can't rebase continue or commit without modified files #60149
Comments
@joaomoreno , can i work on this? :) |
@joaomoreno thank you for referencing my issue, I'm going to subscribe to this thread :) |
@joaomoreno , few points to just clear things
Until this point So after the 4th point is when the Please clarify if I am in the correct path :) |
@skprabhanjan referring to the issue I've opened yesterday (#60275 ), the steps are a bit different. When I accept the current changes (so the file is identical to the version of the last commit) and I click on "+" sign the file disappears from "Merge Changes" but doesn't appear under "Staged Changes". Hope you find this useful, thanks in advance |
@matteobosc , I understand your point that the steps are different but I guess all these will be fixed under the same issue |
You gotta resolve the changes by taking all changes from one side, in order for the file not to end up in the Staged Changes at all. |
@joaomoreno , I will try understanding this more deeply. |
@joaomoreno , is this approach good ? |
Well, no... the staging it correct. Staging those files will end up in a no-op. The problem is that you can't commit in VS Code without changes, although you'd want to continue the rebase/merge in this case. I will remove the |
I run into this issue several times. If I try to
If there are other changes than the conflicted files, VSCode can continue the rebase by just clicking The line that helped me was the following from the error log above:
My workaround:
Suggestion: |
I run into this from time to time as well. Just this last time, I had to |
I know this is quite old, but currently when I hit this scenario and click the |
This only works if you have configured VS Code to allow empty commits |
i still cannot continue the rebase wiht ui cause of empty commit. the old FR #6614 took 2 years, how long will it be this time |
@skprabhanjan ExplanationWhen the user applies the current changes and saves during a rebase conflict, the file disappears from the staged area because there's no changes to commit. When the user then clicks the commit button, the app runs Running To solve this, a skip button can be displayed next to the commit button during rebase. The skip button can also be used to trigger a skip when the user thinks the commit is no longer necessary. An abort button might also be helpful for those who are not familiar with cli so they can abort the rebase |
@skprabhanjan I encountered this issue while pulling the changes from the upstream. Explanation
|
Steps to verify:
|
4 years later |
From @schollii
git rebase master
from command line (bash on ubuntu), and git hits a conflict.The text was updated successfully, but these errors were encountered: