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

new method for merging changes into adjusted branch that avoids unncessary merge conflicts

Browse source 
Still needs work when there are actual merge conflicts.
This commit is contained in:
Joey Hess 2016-04-06 15:33:29 -04:00
parent eb9ac8d6d7
commit b9e4e2ba84
Failed to extract signature
8 changed files with 201 additions and 240 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Annex/Direct.hs
View file

@ -37,7 +37,7 @@ import Annex.Perms
import Annex.ReplaceFile
import Annex.VariantFile
import Git.Index
import Annex.Index
import Annex.GitOverlay
import Annex.LockFile
import Annex.InodeSentinal