diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-04-06 15:33:29 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-04-06 15:36:18 -0400 |
| commit | 2caa1330b3abb4bb2ac60eb8b144046d03a1287b (patch) | |
| tree | 0fcbeabf514847b1eb014fa52ba0ad5bb96ecb18 /Annex/Locations.hs | |
| parent | f33f3e5fa2ef208c6fdeb1f26c3dd3f5a0092b1a (diff) | |
new method for merging changes into adjusted branch that avoids unncessary merge conflicts
Still needs work when there are actual merge conflicts.
Diffstat (limited to 'Annex/Locations.hs')
| -rw-r--r-- | Annex/Locations.hs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Annex/Locations.hs b/Annex/Locations.hs index 4c2816fa9..52753fca8 100644 --- a/Annex/Locations.hs +++ b/Annex/Locations.hs @@ -291,7 +291,8 @@ gitAnnexFeedStateDir r = addTrailingPathSeparator $ gitAnnexDir r </> "feedstate gitAnnexFeedState :: Key -> Git.Repo -> FilePath gitAnnexFeedState k r = gitAnnexFeedStateDir r </> keyFile k -{- .git/annex/merge/ is used for direct mode merges. -} +{- .git/annex/merge/ is used as a empty work tree for direct mode merges and + - merges in adjusted branches. -} gitAnnexMergeDir :: Git.Repo -> FilePath gitAnnexMergeDir r = addTrailingPathSeparator $ gitAnnexDir r </> "merge" |