Darcs: Difference between revisions
No edit summary |
No edit summary |
||
| Line 1: | Line 1: | ||
You can download it and read the manual at [http://www.darcs.net/ darcs homepage]. | |||
== Conflicts == | |||
If there is a conflict, it is good to have a graphical view of the conflicting files and to have a possibility to resolve the conflict using graphical application. I have in my <code>~/.darcs/defaults</code>: | If there is a conflict, it is good to have a graphical view of the conflicting files and to have a possibility to resolve the conflict using graphical application. I have in my <code>~/.darcs/defaults</code>: | ||
ALL external-merge kdiff3 --output %o %a %1 %2 | ALL external-merge kdiff3 --output %o %a %1 %2 | ||
and whenever there is a conflict, it launches <code>kdiff3</code> application, which will help with conflict resolution. | and whenever there is a conflict, it launches <code>kdiff3</code> application, which will help with conflict resolution. | ||
Revision as of 08:10, 9 August 2005
You can download it and read the manual at darcs homepage.
Conflicts
If there is a conflict, it is good to have a graphical view of the conflicting files and to have a possibility to resolve the conflict using graphical application. I have in my ~/.darcs/defaults:
ALL external-merge kdiff3 --output %o %a %1 %2
and whenever there is a conflict, it launches kdiff3 application, which will help with conflict resolution.