Cirrus should offer a possibility to make a 3-way-merge out of a compare session [and vice versa].
(1) My use case
When browsing revision history of an archive I often do diffs between tip revisions of branches made by colleagues and the base revisions of the branches. When I find a change worth to merge into my working copy I'd like to do this immedately. To do this I currently need to exit the diff and start a merge from scratch, find the interesting sections again and merge them.
=> Suggestions:
(2) Compare session => 3-way-merge session
When being in compare session the user enables the button 'merge' (it's not the center-pane button he knows from the common 3-way-merge session, that's important to be consistent to (3)). Then Cirrus goes into 3-way-merge. Left-pane stays left-pane, right pane becomes center pane, right and merge-result panes are empty.
(3) 3-way-merge session => Compare session
Being in 3-way-merge session the user disables the button 'merge'. Then Cirrus should go into compare session. Left-pane stays left pane, center-pane becomes right pane.
(1) My use case
When browsing revision history of an archive I often do diffs between tip revisions of branches made by colleagues and the base revisions of the branches. When I find a change worth to merge into my working copy I'd like to do this immedately. To do this I currently need to exit the diff and start a merge from scratch, find the interesting sections again and merge them.
=> Suggestions:
(2) Compare session => 3-way-merge session
When being in compare session the user enables the button 'merge' (it's not the center-pane button he knows from the common 3-way-merge session, that's important to be consistent to (3)). Then Cirrus goes into 3-way-merge. Left-pane stays left-pane, right pane becomes center pane, right and merge-result panes are empty.
(3) 3-way-merge session => Compare session
Being in 3-way-merge session the user disables the button 'merge'. Then Cirrus should go into compare session. Left-pane stays left pane, center-pane becomes right pane.
Comment