There are one of those changes that you just want to fix the issues brought about by a merge conflict later. The priority is a successful build. We would run a git command as below to favour incoming changes.
git merge source_branch -X theirs
There are one of those changes that you just want to fix the issues brought about by a merge conflict later. The priority is a successful build. We would run a git command as below to favour incoming changes.
git merge source_branch -X theirs