Dealing with a ton of merge conflicts lately, multiple teams keep touching the same files 😅
What tools do you use to resolve git merge conflicts? Are you using something built into your IDE, a standalone diff tool, or just suffering through the CLI Vim like me?
#Git #MergeConflict #SoftwareEngineering #DevTools #OpenSource #Programming #100DaysOfCode
@OVargas
In case of a #git #mergeConflict I first try rebasing it onto the target branch in #GitLab. If that's not possible, I use #TortoiseGit 🐢 for rebasing. Within 🐢 I then diff all the changes I've made in the remote feature branch and then compare them with a diff between the local feature branch and the remote target branch, which should be the same. Then see if everything locally still builds and if so, rewrite the feature branch.
I just hate merge commits. 🤢
Orlando
Xero Slingsby