Darcs: Difference between revisions
No edit summary |
No edit summary |
||
| (One intermediate revision by the same user not shown) | |||
| Line 1: | Line 1: | ||
You can download it and read the manual at [http://www.darcs.net/ darcs homepage]. | You can download it and read the manual at [http://www.darcs.net/ darcs homepage]. There is a [http://rtime.felk.cvut.cz/darcs/darcsweb.cgi web interface] to our darcs reposiries. | ||
== Conflicts == | == Conflicts == | ||
| Line 5: | Line 5: | ||
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. | ||
[[Category:Version Control]] | |||
Latest revision as of 12:42, 18 January 2010
You can download it and read the manual at darcs homepage. There is a web interface to our darcs reposiries.
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.