9
.BASE, .THIS, .OTHER, .moved can't be added nor committed.
10
https://bugs.edge.launchpad.net/bzr/+bug/414589
12
More conflict types should be handled by --auto (and the option
14
https://bugs.edge.launchpad.net/bzr/+bug/344013
15
https://bugs.edge.launchpad.net/bzr/+bug/389396
17
https://bugs.edge.launchpad.net/bzr/+bug/236724
18
https://bugs.edge.launchpad.net/bzr/+bug/228506
19
https://bugs.edge.launchpad.net/bzr/+bug/113809
20
https://bugs.edge.launchpad.net/bzr/+bug/322767
21
https://bugs.edge.launchpad.net/bzr/+bug/416903
22
https://bugs.edge.launchpad.net/bzr/+bug/355964
24
Implement --keep-mine, --take-theirs
25
https://bugs.edge.launchpad.net/bzr/+bug/257297
26
https://bugs.edge.launchpad.net/bzr/+bug/232512
28
https://bugs.edge.launchpad.net/bzr/+bug/457793
33
- make sure .moved files can't be committed !
35
- tests with '.diverted' files ?
40
Providing the ``--interactive`` option to ``bzr resolve`` will
41
display a short explanation of the conflict and propose some
42
actions before marking the file as resolved.
48
The Conflict classes will receive additional methods to resolve
49
the conflict in alternative ways.
51
Resolve will receive a ``--interactive`` option and present a
52
list of possible actions (including do nothing) to the user
53
before marking the file as resolved.
55
The --all and file* parameters will still be honored so that the
56
user can solve conflicts at his own pace.
58
It should be possible for a GUI to query the conflict objects for
59
possible actions (in textual form) and trigger them.
62
Proposed actions by conflict type:
63
==================================
65
The following paragraphs list all the existing conflict types and summarize:
66
- the actions that can be proposed to the user,
67
- the cleanups that could remain to be done once the conflict is solved,
69
In practice, the actions will always contain:
70
- leave the user solve the conflict by its own means,
71
- mark the conflict as solved without any additional action.
added
removed
BRANCH.TODO
