Mastering Vim

Creating merge conflict

Let's use the animal_farm/ repository we initialized earlier in this chapter as an example (or you can follow this with your own example if you have a merge conflict you're trying to resolve):

$ cd animal_farm/

We'll create an additional branch which will conflict with the master branch. In the animal-create branch, we'll rename a make_animal method to create-animal while, in the master branch, we'll change it to build_animal. The order of operations is important in creating the conflict, so you may want to follow closely.

We can start by creating a branch and editing animal_farm.py:

$ git checkout -b create-animal$ vim animal_farm.py

Let's replace our make_animal method with create_animal:

...def create_animal(kind): ...