The -force on the push is required if you skip other commits and both branches are not smooth (both are missing commits from the other).
I'll fix my answer if I find out that I should abort the rebase sooner. Now I can abort the rebase: git checkout I actually have to abort the rebase, but first I fix the conflict, git add /path/to/file the file (another very strange way to resolve the conflict in this case?!), then do a git commit -i /path/to/file.
However, this has a side effect, when I switch to a branch and then git cherry-pick I end up in this weird state every single time it has a conflict. Otherwise, it automatically merges when you switch between branches, which I think is the worst possible choice as the default. I setup my git to autorebase on a git checkout # in my ~/.gitconfig file You are currently rebasing branch '' on '4df0775'. One could likely also skip the rebase, but I wasn't sure what state that would leave me in. When rebasing (eg git checkout my-branch & git rebase master), us refers to master, them refers to your current working branch. I resolved the issue by running git rebase -abort, and then re-running the rebase. git checkout master & git merge my-branch), us refers to master, them is the branch you're merging in. This yields the same messages you saw when you ran your git status and git rebase -continue commands. After resolving conflicts during a rebase, I committed my changes, rather than running git rebase -continue. To check out the original branch and stop rebasing, run "git rebase -abort". If you prefer to skip this patch, run "git rebase -skip" instead. When you have resolved this problem, run "git rebase -continue". If there is nothing left to stage, chances are that something elseĪlready introduced the same changes you might want to skip this patch.
No changes - did you forget to use 'git add'? This is the output of: git rebase -continue Applying: no message I don't know what to do? Does it really take this long to rebase? git rebase -continue doesn't do anything. When I do: ls `git rev-parse -git-dir` | grep rebase || echo no rebase Nothing to commit, working directory clean (all conflicts fixed: run "git rebase -continue") You are currently rebasing branch 'master' on '9c168a5'. I see this: rebase in progress onto 9c168a5
0 kommentar(er)
