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

Merge branch 'master' of ssh://git-annex.branchable.com

Browse source
This commit is contained in:
Joey Hess 2014-03-05 18:43:24 -04:00
commit 9b7f7dbb97
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
doc/devblog/day__126-127__merge_fixes.mdwn
View file

@ -8,7 +8,7 @@ Understanding the bug was easy. Fixing it turned out to be hard, because
the automatic merge conflict resolution code was quite a mess. In
particular, it wrote files to the work tree, which made it difficult for a
later stage to detect and handle the abovementioned case. Also, the
automatic merge resolution code had weird asymetric structure that I never
automatic merge resolution code had weird asymmetric structure that I never
fully understood, and generally needed to be stared at for an hour to begin
to understand it.
@ -27,7 +27,7 @@ Finally this evening, I added support for automatically handling merge
conflicts where one side is an annexed file, and the other side has the
same filename committed to git in the normal way. This is not an important
case, but it's worth it for completeness. There was an unexpected benefit
to doing it; it turned out that the weird asymetric part of the code went
to doing it; it turned out that the weird asymmetric part of the code went
away.
The final core of the automatic merge conflict resolver has morphed from

8
doc/forum/git-annex_on_osx_10.9.1_just_crashes__47__closes__47__doesn__39__t_run_on_launch/comment_1_a47174f8438bfaa42fb8067bca77bf4c._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="209.250.56.146"
subject="comment 1"
date="2014-03-05T22:30:00Z"
content="""
The thing to do is to try to start git-annex from the command line in a terminal. This should get an error message that will help find out what's going wrong.
"""]]