https://puntoblogspot.blogspot.com/2019/06/tiu-git-merge-xpatience-xignore-all.html
puntoblogspot: TIU: git merge -Xpatience -Xignore-all-space
For better or worse, I'm becoming an expert on git merges. Today I got to use (TodayIUsed) the special flags: "git merge -Xpatience -Xigno...
git mergetiuspace