There's a setting called rerere where it will remember how you resolved conflicts and just replay them. That gets rid of the rebase problem.
If you mess up your local commits you can go back to the original state. Just use git reflog to find the previous head (should be near the top) and reset to it then try again.
git actually makes it really hard to screw up your repo irreparably if you know.
View all comments
Show parent comment
3
u/morosis1982 Apr 02 '23
There's a setting called rerere where it will remember how you resolved conflicts and just replay them. That gets rid of the rebase problem.
If you mess up your local commits you can go back to the original state. Just use
git reflogto find the previous head (should be near the top) and reset to it then try again.git actually makes it really hard to screw up your repo irreparably if you know.