Keep the branches short-lived and avoid working on the same parts of the code. Avoiding the same parts of the code applies to whatever branching strategy you are using.
There's rarely a need for two people to work on the same bits of code in the same period. This can usually be recognized during triage and planning.
In the unusual case where two people are working on the same code, it should be for the same feature, in which case, they can share a branch. And they should probably sit close to each other in the office and communicate.
The moment one of them feels the need to pull from the other's branch, the warning sirens should go off. It sounds like a monster branch is growing.
For further actions, you may consider blocking this person and/or reporting abuse
We're a place where coders share, stay up-to-date and grow their careers.
Keep the branches short-lived and avoid working on the same parts of the code. Avoiding the same parts of the code applies to whatever branching strategy you are using.
There's rarely a need for two people to work on the same bits of code in the same period. This can usually be recognized during triage and planning.
In the unusual case where two people are working on the same code, it should be for the same feature, in which case, they can share a branch. And they should probably sit close to each other in the office and communicate.
The moment one of them feels the need to pull from the other's branch, the warning sirens should go off. It sounds like a monster branch is growing.