![testcase notes] #31: Conflict, default commit messages · Issue #78 · dorawyy/git-merge-conflicts-test · GitHub testcase notes] #31: Conflict, default commit messages · Issue #78 · dorawyy/git-merge-conflicts-test · GitHub](https://user-images.githubusercontent.com/16771854/32914453-7bc6e43c-caca-11e7-9142-1f5eafb5217e.png)
testcase notes] #31: Conflict, default commit messages · Issue #78 · dorawyy/git-merge-conflicts-test · GitHub
![How the git mergetool solved my anxiety, fears, and most importantly, my merge conflicts | Knight Lab How the git mergetool solved my anxiety, fears, and most importantly, my merge conflicts | Knight Lab](https://knightlab.northwestern.edu/wp-content/uploads/2014/12/2.png)
How the git mergetool solved my anxiety, fears, and most importantly, my merge conflicts | Knight Lab
![testcase notes] #31: Conflict, default commit messages · Issue #78 · dorawyy/git-merge-conflicts-test · GitHub testcase notes] #31: Conflict, default commit messages · Issue #78 · dorawyy/git-merge-conflicts-test · GitHub](https://user-images.githubusercontent.com/16771854/32914236-b925c36c-cac9-11e7-9078-8317f665dc4d.jpg)
testcase notes] #31: Conflict, default commit messages · Issue #78 · dorawyy/git-merge-conflicts-test · GitHub
![How the git mergetool solved my anxiety, fears, and most importantly, my merge conflicts | Knight Lab How the git mergetool solved my anxiety, fears, and most importantly, my merge conflicts | Knight Lab](https://knightlab.northwestern.edu/wp-content/uploads/2014/12/1.png)