learning-about-version-control Author Ethan Fang Solving merge conflicts takes conscious effort, but I can do it! version control makes it easy to check back. the most challenging part might be the syntax of git commands.