new method for merging changes into adjusted branch that avoids unncessary merge conflicts
Still needs work when there are actual merge conflicts.
This commit is contained in:
parent
eb9ac8d6d7
commit
b9e4e2ba84
8 changed files with 201 additions and 240 deletions
|
@ -23,7 +23,7 @@ import Annex.HashObject
|
|||
import Git.Types
|
||||
import Git.FilePath
|
||||
import Annex.WorkTree
|
||||
import Annex.Index
|
||||
import Annex.GitOverlay
|
||||
import Annex.Link
|
||||
import Annex.CatFile
|
||||
import Logs.MetaData
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue