HI Team,
When i merge feature branch to dev branch i am getting conflict(someone else pushed to dev branch so conflict) but when i checkout those component which is having conflict into feature branch from dev i am getting file as Modified.Any help?
I am in feature branch then i give i am expecting conflict but getting file as modfied.
git checkout dev -- src/classes/apex1.cls
