Avoid Git conflict

Asked Jun 22 '21 at 14:11

Active Jun 22 '21 at 17:14

Viewed 53 times

Let's admit I want to work on a doc document with 2 parts, and I want to work on these 2 parts with 2 different branches part1 and part2, created from master.

When I merge part1 into master, nothing wrong but then, when I merge part2 into master, I have conflicts.

Is there a way to avoid that kind of conflict? If not should I just resolve conflicts, or are there good practices to avoid them?

edited Jun 22 '21 at 17:14

mnestorov

3,508
2
14
22

asked Jun 22 '21 at 14:11

kalyklos

3

Don't be afraid of git conflicts. – evolutionxbox Jun 22 '21 at 14:21
2

Does this answer your question? [How to resolve merge conflicts in Git repository?](https://stackoverflow.com/questions/161813/how-to-resolve-merge-conflicts-in-git-repository) – mnestorov Jun 22 '21 at 17:16
"doc" document, as in word? Use word compare function (I know it exists, don't know how it fare) . – NoDataFound Jun 22 '21 at 17:17
2

Best practice is to try to avoid editing the same part of a file from multiple places at the same time. – 0x5453 Jun 22 '21 at 17:24

Avoid Git conflict

0 Answers0