![5 steps to resolve merge conflicts in Bitbucket repository with git bash - DEV Community π©βπ»π¨βπ» 5 steps to resolve merge conflicts in Bitbucket repository with git bash - DEV Community π©βπ»π¨βπ»](https://res.cloudinary.com/practicaldev/image/fetch/s--qYMJUGe3--/c_imagga_scale,f_auto,fl_progressive,h_900,q_auto,w_1600/https://dev-to-uploads.s3.amazonaws.com/uploads/articles/bevzpede4bkday7n1n4z.jpg)
5 steps to resolve merge conflicts in Bitbucket repository with git bash - DEV Community π©βπ»π¨βπ»
![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)