search

UCL-COMP0233-22-23 / RSE-Classwork

11 stars 66 forks source link

Generating and resolving conflicts #6

Closed greneus closed 1 year ago

greneus commented 1 year ago

At merge conflict, README.me looks like (in VIM):

<<<<<<< HEAD
Hola
=======
Hello World
>>>>>>> new-branch

By deleting the lines except for Hello world, the merge conflict is resolved and the result can be committed.

dpshelio commented 1 year ago

You had to create this issue in your fork (see point 5 in #3)