mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

updae

Browse source
This commit is contained in:
Joey Hess 2016-03-29 12:50:25 -04:00
parent 5e1d7bbc00
commit 4226ae1040
Failed to extract signature
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
doc/design/adjusted_branches.mdwn
View file

@ -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