diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-03-29 12:50:25 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-03-29 12:50:25 -0400 |
| commit | c079545a6a3a85f92fbf592229b5f90dbb2da856 (patch) | |
| tree | 28e416e702e8a1e5df36b5147e77e14ab6d5423a /doc/design/adjusted_branches.mdwn | |
| parent | d88340524510e82c4fce59f33f64d8e25031ae9e (diff) | |
updae
Diffstat (limited to 'doc/design/adjusted_branches.mdwn')
| -rw-r--r-- | doc/design/adjusted_branches.mdwn | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/doc/design/adjusted_branches.mdwn b/doc/design/adjusted_branches.mdwn index d226e5304..4ef229e1d 100644 --- a/doc/design/adjusted_branches.mdwn +++ b/doc/design/adjusted_branches.mdwn @@ -138,7 +138,7 @@ conflict.) ------ -FIXME: When an adjusted unlocked branch has gotten a file, and a new +TODO FIXME: When an adjusted unlocked branch has gotten a file, and a new commit is merged in, that does not touch that file, there is a false merge conflict on the file. It's auto-resolved by creating a .variant file. This is probably a bug in the auto-resolve code for v6 files. @@ -296,8 +296,6 @@ into adjusted view worktrees.] ## TODOs -* Need a better command-line interface than `git annex adjust`, - that allows picking adjustments. * Interface in webapp to enable adjustments. * Entering an adjusted branch can prevent commits to the current branch (locking will cause the commits to fail) and so the assistant |