Merging: Resolving merge conflicts

Sometimes while merging a branch, you might encounter a conflict. This usually means that someone updated files in master and you also updated those same files in your branch. Abstract surfaces these differences so that you can choose what changes to keep and what changes to discard in your branch. In this video, we’ll discuss what causes merge conflicts and how you can resolve them in Abstract.

--

Chapters:
0:00 What is a merge conflict?
0:43 Example of a merge conflict
1:16 What you should know about resolving conflicts
2:05 What causes merge conflicts
3:15 Tips to avoid merge conflicts
4:26 Team exercise

--