Mergeing Branching is showing conflict but git check checkout is not showing conflict

naresh2389 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 conflict.

 

git merge dev

Checkout command

git checkout sit --src/app.cls

0 answers

Suggest an answer

Log in or Sign up to answer
TAGS
AUG Leaders

Atlassian Community Events