Automatically merging conflicts in Xcode project files

Dec 21, 2021 Automatically merging conflicts in Xcode project files

Using different Git config for personal and work projects

Dec 2, 2020 Using different Git config for personal and work projects

Using Visual Studio Code as Git merge tool

Nov 15, 2017 Using Visual Studio Code as Git merge tool