I am trying to push my code into my created branch. Before doing "Push changes immediately to origin/freature/xxx", I think I need to "Resolve Conflicts" by using such as "Using theirs" or "Using mine". But all these options are grayed out when I right-clicked the file and tried to do Resolve Conflicts option.
Can you shed some light?
Resolve conflicts is only used in one situation: You've performed a merge, and SourceTree has notified you that conflicts arose during the merge that couldn't be resolved automatically. A conflict is usually a situation where the same portion of a file was edited differently in the two branches that are being merged.
What makes you think you need to be resolving conflicts?
Thank you for your answers.
I am fresh to the SourceTree and using the version control software such as GIT.
My original plan was to send out "Pull Request" but curious about how to resolve conflicts. Now, it seems that I should worry about "Resolve Conflicts" when I try to merge my modified code into the "master".
So, now I guess my question has been changed to "how to merge the master code into my modified code in the sourcetree then I can resolve the conflicts"?
Supported Platforms macOS Windows We recently introduced support for additional hosting services such as GitHub Enterprise, GitLab (Cloud, Community Edition, Enterprise Edition), and...
Connect with like-minded Atlassian users at free events near you!Find a group
Connect with like-minded Atlassian users at free events near you!
Unfortunately there are no AUG chapters near you at the moment.Start an AUG
You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs