Explore strategies to reduce merge conflicts Git


show more Exploring strategies to reduce merge conflicts provides you with in-depth training on Developer. Taught by Kevin Skoglund as part of the Git Essential Training show less
please wait ...

Exploring strategies to reduce merge conflicts

I want to conclude our discussion of merging by giving you some strategies that you can use to try to take some of the pain out of merge conflicts, to reduce them and to make them easier to deal with. I think this is important, because handling merge conflicts is really the only part of working with branches that can be at all painful. The first tip is to keep lines short. In the example that we just did, we had three large paragraphs of text, so we've got our merge conflict, we didn't know for sure where the conflict was in those three blocks of text. But by keeping the line short will make it much easier to spot where the problems were, because Git would then be able to show us, ah, the error was actually in the first part of this very long paragraph, not just somewhere inside of this paragraph, so it makes them easier to deal with.

And in some cases, it might allow Git to resolve some of those conflicts for you automatically and have less work for you to do. The seco...

Exploring strategies to reduce merge conflicts
Video duration: 4m 1s 6h 25m Beginner

Viewers:

Exploring strategies to reduce merge conflicts provides you with in-depth training on Developer. Taught by Kevin Skoglund as part of the Git Essential Training

Subject:
Developer
Software:
Git GitHub
Author:
please wait ...