Merging from one branch to another branch is something common with Git. I had to do it several times and recently I had to make a big one. I’ve just never took the time to look at what exist to make faster merge and how to use it.
After some researches, I found git mergetool which will use VIM (by default on my laptop) to have a better view on what I have to do, to merge my files.
