How do I deal with conflicts in my Git repo? - Beanstalk Help
linux - Merge branch 'master' Can't git pull - Stack Overflow
Git Merge and Merge Conflict - javatpoint
Squashing Your Pull Requests – Cloud Four
How to exit a git merge asking for commit message? - Unix & Linux Stack Exchange
Polish my git feature branch before merging or submitting for review | egghead.io
Squash the Last X Commits Using Git | Baeldung
Git-Checkout And Merge - GeeksforGeeks
How To Resolve Merge Conflicts in Git {Step-by-Step Guide}
How to manually commit your own merge commit – 103 – Sara Ford's Blog
visual studio code - GIT merge with conflicts generated message appears - Stack Overflow
The Ultimate Guide to Git Merge and Git Rebase
![testcase notes] #31: Conflict, default commit messages · Issue #78 · dorawyy/git-merge-conflicts-test · GitHub](https://user-images.githubusercontent.com/16771854/32915194-e5c22dc2-cacc-11e7-8324-008cb251ac0b.png "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
![testcase notes] #31: Conflict, default commit messages · Issue #78 · dorawyy/git-merge-conflicts-test · GitHub](https://user-images.githubusercontent.com/16771854/32914910-029c7890-cacc-11e7-8066-f46a7e9623f4.png "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
![testcase notes] #31: Conflict, default commit messages · Issue #78 · dorawyy/git-merge-conflicts-test · GitHub](https://user-images.githubusercontent.com/16771854/32915298-407b5536-cacd-11e7-864d-32b70ca020d1.jpg "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
![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")
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/32915241-1013a72c-cacd-11e7-9c40-24b6853dbd4c.png "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
Git Merge Tutorial
How the git mergetool solved my anxiety, fears, and most importantly, my merge conflicts | Knight Lab
Merge Conflicts and How to handle them - GeeksforGeeks
How can I stop git merge prompt message keep popping up everytime I do git pull? - Stack Overflow
