diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2017-06-01 11:56:56 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2017-06-01 11:56:56 -0400 |
| commit | 5c058d99a26da3639afcbf855eb7b6ca3d628fb3 (patch) | |
| tree | 0ac7b5c477bfbc273d0d9eb8d0a07fde8e18a5f0 /doc/automatic_conflict_resolution.mdwn | |
| parent | 8fa7c51f198cca8516e5e46de114e7dcd6823767 (diff) | |
expand docs
Diffstat (limited to 'doc/automatic_conflict_resolution.mdwn')
| -rw-r--r-- | doc/automatic_conflict_resolution.mdwn | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/automatic_conflict_resolution.mdwn b/doc/automatic_conflict_resolution.mdwn index 095cfde7d..0d4f55a01 100644 --- a/doc/automatic_conflict_resolution.mdwn +++ b/doc/automatic_conflict_resolution.mdwn @@ -21,3 +21,5 @@ conflict resolution is designed so that if two or more repositories both get a merge conflict, and resolve it, the resolved repositories will not themselves conflict. This is why it doesn't use something nicer, like perhaps the name of the remote that the file came from. + +See also: [[git-annex-resolvemerge]] |