GIT: Solving conflicts preserving my files – An easy way without merging

>PROBLEM

You’ve made a pull and you got conflicts.

>SOLUTION

An easy alternative without having to merge files.

1. Take note of those files that has conflict issues.
2. Move the conflicting files to a temporary folder.
3. Commit again.
   git commit -am “solving merge conflicts preserving mine”
4. Reset the state to the previous one, before the pull command.
   git reset –hard HEAD
5. Perform pull again:
   git pull
6. Move back the files from the temporary folder to the project folder.
7. Commit again:
   git commit -am “solved merge conflicts preserving mine”
8. Push to remote:
   git push

Andre Dias

Brazilian system analyst graduated by UNESA (University Estácio de Sá – Rio de Janeiro). Geek by heart.