After pull from origin, when a merge conflict arises: Check files Choose lines you want to have save file git add -u git commit -m "blabla" ... go on ... Tags git
