#15 Git: merging conflicts in git

Git Tutorial / June 20, 2021

This post gives the basic idea to solve the conflicts and then merge them. Also introduces some important commands, which helps us to maintain the git branches.