2: Aborting A Merge( Merge Conflicts )

When a merge conflict occurs, git adds markup lines to the files that have conflicts that identify where the conflicts are. These lines can prevent code from executing properly, because they can't be interpreted by the Python interpreter. Because of this, it's important to immediately resolve conflicts and remove the markup.

One way to resolve a conflict is to abort the merge. This doesn't actually merge the files together, but instead stops attempting to merge them. This can be done with git merge --abort.

Aborting the merge is usually an action you would take if you merged one branch into another by accident, or want to deal with large merge conflicts another way. When you abort a merge, git resets the state of the working directory and git history to the state before you tried to merge.

Instructions

• Abort the merge from the last screen that had conflicts

 

/home/dq/chatbot$ cd /home/dq/chatbot                                           

/home/dq/chatbot$ git merge --abort                                             

转载于:https://my.oschina.net/RobertPattins/blog/747109