Viewing profile — altonen

You can also use git-reflog to restore the branch back to the state it was before the merge. So instead of creating a temporary branch, you can inspect the reflog, find the entry b…

If you use git-rerere you don't have to fix the same conflicts over and over again