![How the git mergetool solved my anxiety, fears, and most importantly, my merge conflicts | by Suyeon Son | Ideas: Journalism + Tech | Medium How the git mergetool solved my anxiety, fears, and most importantly, my merge conflicts | by Suyeon Son | Ideas: Journalism + Tech | Medium](https://miro.medium.com/max/1400/0*f5b-I3lZJWrTPMT9.png)
How the git mergetool solved my anxiety, fears, and most importantly, my merge conflicts | by Suyeon Son | Ideas: Journalism + Tech | Medium
![vsc terminal(git bash) display error when i use "git merge --no-ff" · Issue #55989 · microsoft/vscode · GitHub vsc terminal(git bash) display error when i use "git merge --no-ff" · Issue #55989 · microsoft/vscode · GitHub](https://user-images.githubusercontent.com/16743116/43825681-f5b0714a-9b27-11e8-9fc5-9bf994bff62e.png)
vsc terminal(git bash) display error when i use "git merge --no-ff" · Issue #55989 · microsoft/vscode · 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)