Link to home
Create AccountLog in
Avatar of thready
thready

asked on

git rebase- conflicts - help!!

Hi git experts!

I did a git rebase onto another branch.  It started on its merry way, then got into some conflicts.  I realized I could just "git cherrypick" instead and tried to undo my rebase with:

git reset --hard ORIG_HEAD

now it looks good- but the name of the branch changed from dev to dev|REBASE.  Why??

Thank you!
Mike
ASKER CERTIFIED SOLUTION
Avatar of gelonida
gelonida
Flag of France image

Link to home
membership
Create an account to see this answer
Signing up is free. No credit card required.
Create Account
Avatar of thready
thready

ASKER

all i needed was the git rebase --abort
thanks!