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

comment

Browse source
This commit is contained in:
Joey Hess 2019-07-19 13:12:51 -04:00
parent cf6152575a
commit 040be6bc22
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
1 changed files with 14 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

14
doc/forum/Handling_merge_conflicts_in_direct_mode/comment_1_7046393b0c4329466a0d6803b718f786._comment Normal file
View file

@ -0,0 +1,14 @@
[[!comment format=mdwn
username="joey"
subject="""comment 1"""
date="2019-07-19T17:10:41Z"
content="""
I'd encourage you to stop using direct mode, which is well on its way to
being deprecated and has never been flexible enough to do this kind of
thing easily.
If you `git annex upgrade` that repository, you will get a v7 repository
with an adjusted unlocked branch checked out, which is equivilant to a
direct mode repository, but lets you use arbitrary git commands for merging
etc.
"""]]