AWESOME way to resolve Git merge conflicts
In a large software engineering team, git merge conflicts are almost unavoidable. You can’t really keep merge conflicts from arising. What you can control is how you resolve them.
In a large software engineering team, git merge conflicts are almost unavoidable. You can’t really keep merge conflicts from arising. What you can control is how you resolve them.