Resolving GIT Merge Conflicts

Merge conflicts are inevitable, they can easily be resolved using free tools such as Tortoise Git and Visual Studio Code.

Example: Merging feature-branch → sprint-branch

git checkout sprint-branch
git fetch origin
git merge origin/feature-branch

(now resolve conflicts in VS Code)
~ VS Code displays the conflicts for you and give you the option to select what you want.
~ Sweet! Now save local file.

git push origin sprint-branch