The more you change in a file, the greater the potential for conflict. You should avoid making a monolithic change that combines multiple feature enhancements or bug fixes into one. A Git merge conflict may seem intimidating at first, but now that you know how to do it, you'll see that it's easily resolved.
1 Comment
Sort: