git - J'ai couru dans un conflit de fusion. Comment puis-je avorter la fusion

96

git reset --hard HEAD 

git pull --strategy=theirs remote_branch 

git fetch origin git reset --hard origin 

81

git merge --abort 

72

# common base: git show :1:_widget.html.erb  # 'ours' git show :2:_widget.html.erb  # 'theirs' git show :3:_widget.html.erb 

git show :3:_widget.html.erb >_widget.html.erb git add _widget.html.erb 

git checkout --theirs _widget.html.erb