Detect conflicts before merging files that will cause conflicts in the future

68 views Asked by At

Prerequisite

  • Developing the same repository with multiple (3 ~ 5) developers

  • Each developer works on a different branch. When work is finished, it is merged into the main branch.

What is the problem?

If you are working on a large project, you will be working on the same branch for a long time without merging into main. This increases the risk of conflicts. We want to be aware of the risk of conflicts as soon as possible.

What kind of method do you think is best? I would like to know if there is already a script or tool to perform this task.

What I tried

Frequently merging main into a working branch is not much of a solution, since it does not necessarily mean that someone else's work has been merged into main.

We want to know if a conflict will occur when another developer's branch is pushed.

0

There are 0 answers