https://community.atlassian.com/forums/Bitbucket-questions/Mergeing-Branching-is-showing-conflict-but-git-check-checkout-is/qaq-p/1689387
Mergeing Branching is showing conflict but git che...
May 10, 2021 - HI All, Git merge is showing conflict for the file and for same file when i use checkout command specific file from branch it is not showing
branchingshowingconflictgitche