Learning about Version Control by: Jiro Amato Solving merge conflicts takes conscious effort, but I can do it! Opinions: I find remembering all the git commands, regarding version control challenging. I find all the terms about version control confusing.