Are collaborative merges still a thing?

[David Cañadas]

Hi!

A few years ago I proposed this "Collaborative merges" feature while working at Digital Legends. It was even mentioned in your Twitter account

The idea behind Collaborative Merges is to help resolving merge conflicts that involve more than one person, something that occurs quite often in medium to big projects. Now, merges requiring more than one person to resolve conflicts forces the one running the merge operation to ask everyone involved to either come to his/her spot or connect remotely to resolve conflicts. Besides that, your workspace is locked until the merge operation is either completed or undone.

As the Plastic merge status is locally stored as a bunch of files, would be great if such state can be sent to another user, so you can start the merge, resolve just your conflicts, and send the merge over to the next user, undo your changes and continue working normally with your workspace meanwhile. Of course, some things have to be settled up, for instance the collaborative merge instance shall block the branch target, or to use a temporary or child branch to reduce the impact within the merge operation.

I would like to know whether is this still a thing or has been discarded/postponed

Thanks!

 

[calbzam]

Hi,

Thanks for reminding this feature request. I think it's a very powerful feature. I will be discussing it with the team this week. I don't think it will be ready in the near future but I will it try to be considered in the roadmap.

Best regards,

Carlos.

[David Cañadas]

Thank you!