Hey Funda nice effort you've put in the article. I've also written an article on Manage Branches and Resolve Conflicts. Your Feedback would be welcome :)
We're a place where coders share, stay up-to-date and grow their careers.
We strive for transparency and don't collect excess data.