CODEWITHSUNDEEP
svntortoisesvnmerge-conflict-resolution
Narek Malkhasyan
Narek Malkhasyan

Reputation: 1442

Collaborative Merge Conflict Resolution in Tortoise SVN

Imagine the following scenario: when trying to merge the changes on the trunk with a branch, there are conflicts on 10 different files which are authored and maintained by 3 different developers. This means that a single team member cannot conduct the conflict resolution, as there are parts in which he is not competent enough.

Is there a way to carry out the conflict resolution collaboratively? In other words, can this work be divided among several team members who can commit their resolutions separately?

Upvotes: 0

Views: 248

Answers (1)

Lazy Badger
Lazy Badger

Reputation: 97395

Just as idea: it can be 3 sequential merges (from branch to trunk), performed by 3 developers

Main idea behind the scene - each developer touch only "own" files, all other conflicted files before commit are prepared with svn resolve --accept 'mine-conflict' (maybe 'mine-full', because "my" is in this case are files of trunk)

Can't recall, how to to it fully in TSVN GUI (and is it possible at all), try to find answer in GUI (or use CLI-mode)

Upvotes: 1

Related Questions