Sublime merge rebase5/9/2023 Precise and Flexible Commit exactly what you want with line-by-line and hunk staging. Here's the result of git rebase -continue: $ git rebase -continueĬat: c:/_work/project/src/git/.git/rebase-merge/prev_head: No such file or directoryĬat: c:/_work/project/src/git/.git/rebase-merge/end: No such file or directoryĬat: c:/_work/project/src/git/.git/rebase-merge/msgnum: No such file or directoryĬat: c:/_work/project/src/git/.git/rebase-merge/onto: No such file or directoryĪny ideas? I would like to reset the situation back to the state it was before I started my well-thought rebase operation. With a zippy cross-platform GUI toolkit, an unmatched syntax highlighting engine, and a custom high-performance Git reading library, Sublime Merge sets the bar for performance. Rm: cannot remove directory `c:/_work/project/src/git/.git/rebase-merge': Directory Rm: cannot remove `c:/_work/project/src/git/.git/rebase-merge/done': Permission denied HEAD is now at 4c737fb Revert "Modified file names" Here's how git rebase -abort looks like: $ git rebase -abortĬat: c:/_work/project/src/git/.git/rebase-merge/quiet: No such file or directoryĬat: c:/_work/project/src/git/.git/rebase-merge/head-name: No such file or directoryĬat: c:/_work/project/src/git/.git/rebase-merge/orig-head: No such file or directory When rebasing (eg git checkout my-branch & git rebase master), us refers to master, them refers to your current working branch. git/rebase-merge/head-name: No such file or directory git checkout master & git merge my-branch), us refers to master, them is the branch you're merging in. , ls, git rebase.) inside my repository gives the following error:Ĭat. Git shows the current branch as (|REBASE-m). With rebase, theres no merge commit, because your branch is magically changed to have been cut from the latest code. Now the interactive rebase seems to be "stuck". Before running the "git commit -amend" (and after the git rebase -interactive) I decided that my changes were incorrect and so I executed "git reset HEAD -hard". I was trying to fix a broken commit by using the following instructions. I managed to create a little mess in my local git repository.
0 Comments
Leave a Reply. |