|
|
|
|
|
|
by activatedgeek
3187 days ago
|
|
|
That is a standard problem you face in all projects and the conflict resolution generally happens on a First Come First Serve basis. Of course, the maintainer could decide it on the basis of priority and then the person merging to master next is responsible to fix the new conflicts. |
|
|