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
Hey Community! We’re willing to wager that quite a few of you not only use Bitbucket, but administer it too. Our team is excited to share that we’ll be releasing improvements throughout this month of...
Connect with like-minded Atlassian users at free events near you!Find an event
Connect with like-minded Atlassian users at free events near you!
Unfortunately there are no Community Events near you at the moment.Host an event
You're one step closer to meeting fellow Atlassian users at your local event. Learn more about Community Events