The general idea was that conflicts would only be happening when a
developer pushes to the branch and a different developer pushes
directly to the archive. If we're getting massive merge proposals, I
suggest that figuring out why that is happening is important.
The reason for using mps is that:
- developers didn't want work they have pushed to the branch lost
- bugs with attachments seemed ugly and less user friendly.
The general idea was that conflicts would only be happening when a
developer pushes to the branch and a different developer pushes
directly to the archive. If we're getting massive merge proposals, I
suggest that figuring out why that is happening is important.
The reason for using mps is that:
- developers didn't want work they have pushed to the branch lost
- bugs with attachments seemed ugly and less user friendly.