Source tree rebase issue(merge conflicts)

[Tai Huynh]

Hi Support Team,

Hi,

We are having an issue with Source Tree regarding rebasing master branch and Development branch.

Currently we have a Dev branch that has been doing development since October 2022, and we have a master branch that has been getting updated by different branches.
The Dev branch has been isolated from the master branch since October and we would like to merge it to the master branch. However, during the merge we are seeing conflicts in Source Tree requesting us to resolve issues.

"You now have merge conflicts in your working copy that need to be resolved before continuing. You can do this by selecting the conflicted files and using the options under the "Resolve Conflicts" menu."

When we attempted to resolve the conflicts, there are files that were not changed from both Dev branch or Master branch. They are identical files but it is saying there are merge conflicts for those files.

Thanks,
Tai