Aborting a merge in git
Posted
by user18666
on Stack Overflow
See other posts from Stack Overflow
or by user18666
Published on 2008-09-19T13:21:00Z
Indexed on
2010/03/28
23:23 UTC
Read the original article
Hit count: 181
version-control
|git
I've done 'git pull', and received a merge conflict. I know that the other version of the file is good, and that mine is bad (all my changes should be abandoned). How do I do this?
unmerged: _widget.html.erb
You are in the middle of a conflicted merge.
© Stack Overflow or respective owner