Joey Hess ba42b67c70 Fix bug in automatic merge conflict resolution ... When one side is an annexed symlink, and the other side is a non-annexed symlink. In this case, git-merge does not replace the annexed symlink in the work tree with the non-annexed symlink, which is different from it's handling of conflicts between annexed symlinks and regular files or directories. So, while git-annex generated the correct merge commit, the work tree didn't get updated to reflect it. See comments on bug for additional analysis. Did not add this to the test suite yet; just unloaded a truckload of firewood and am feeling lazy. This commit was sponsored by Adam Spiers.		2014-07-08 13:55:11 -04:00
..
Android	update some comments re ssh password entry on Android	2014-05-15 15:20:24 -04:00
android
assistant	Added a comment	2014-05-25 15:10:34 +00:00
automatic_conflict_resolution	Added a comment: auto conflict resolution	2014-04-19 17:26:11 +00:00
backends	Added a comment: fast migrate	2014-07-05 08:21:21 +00:00
bare_repositories
bugs	Fix bug in automatic merge conflict resolution	2014-07-08 13:55:11 -04:00
coding_style	Added a comment: What about safe?	2014-07-06 10:46:00 +00:00
contact
copies
design	update month	2014-07-08 12:39:07 -04:00
devblog	devblog	2014-07-07 16:11:10 -04:00
direct_mode
download
ekg
encryption	removed	2014-04-12 03:51:56 +00:00
footer
forum	Added a comment	2014-07-08 12:26:59 +00:00
how_it_works
install	Typo	2014-07-06 10:32:30 +00:00
internals
license
links
metadata	Added a comment	2014-03-17 19:32:39 +00:00
news	add news item for git-annex 5.20140707	2014-07-07 12:41:47 -04:00
not	Added a comment	2014-05-16 18:59:47 +00:00
polls
preferred_content	note webapp	2014-04-24 14:14:34 -04:00
special_remotes	Added a comment: that is an ancient version of git-annex, Shane	2014-07-02 17:11:24 +00:00
sync	Added a comment	2014-05-15 19:54:54 +00:00
templates	tag layout	2014-05-30 16:33:06 -04:00
testimonials
tips	Merge branch 'master' of ssh://git-annex.branchable.com	2014-07-03 14:27:28 -04:00
todo		2014-07-08 13:16:10 +00:00
upgrades
use_case
users	try to build an hybrid news feed	2014-06-09 23:24:20 +00:00
videos	Added a comment	2014-06-11 19:56:49 +00:00
walkthrough	remove setup_git page	2014-05-18 11:26:11 -04:00
Android.mdwn
assistant.mdwn	update	2014-06-04 12:56:59 -04:00
automatic_conflict_resolution.mdwn
backends.mdwn
bare_repositories.mdwn
bugs.mdwn	more bug metadata etc	2014-05-30 17:08:20 -04:00
builds.mdwn	android version	2014-07-07 14:27:40 -04:00
coding_style.mdwn
comments.mdwn
contact.mdwn
contribute.mdwn	update	2014-05-30 17:11:34 -04:00
copies.mdwn	update for required content	2014-03-29 14:39:10 -04:00
design.mdwn
devblog.mdwn
direct_mode.mdwn
distributed_version_control.mdwn
download.mdwn
ekg.mdwn
encryption.mdwn
favicon.ico	remove photoshop droppings and regenerate favion using a free tool	2014-03-16 16:05:27 -04:00
feeds.mdwn
forum.mdwn
future_proofing.mdwn
git-annex-shell.mdwn	typo	2014-04-11 12:12:34 -04:00
git-annex.mdwn	import metadata from feeds	2014-07-03 14:15:00 -04:00
git-union-merge.mdwn
how_it_works.mdwn
index.mdwn	link to the haskell page, which has many teaching resources about it	2014-04-08 22:44:28 +00:00
install.mdwn	installation with homebrew	2014-06-05 19:01:51 +00:00
internals.mdwn	update for required content	2014-03-29 14:39:10 -04:00
license.mdwn
location_tracking.mdwn
logo-old-bw.svg
logo-old.png
logo-old.svg
logo-old_small.png
logo.mdwn
logo.svg
logo_16x16.png	remove photoshop droppings and regenerate favion using a free tool	2014-03-16 16:05:27 -04:00
logo_32x32.png	remove photoshop droppings and regenerate favion using a free tool	2014-03-16 16:05:27 -04:00
logo_small.png
meta.mdwn
metadata.mdwn		2014-04-07 11:46:18 +00:00
news.mdwn
not.mdwn
polls.mdwn
preferred_content.mdwn		2014-04-07 11:44:11 +00:00
privacy.mdwn	fix link	2014-05-30 15:31:49 -04:00
publicrepos.mdwn	add papers repo	2014-06-04 13:29:58 -04:00
related_software.mdwn	link to magit-annex	2014-03-22 17:28:05 -04:00
repomap.png
required_content.mdwn	Added required content configuration.	2014-03-29 16:03:33 -04:00
scalability.mdwn	remove old note about unused needing lots of memory; it's used bloom filters for a while to run in constant ram	2014-06-18 18:39:19 -04:00
shortcuts.mdwn
sidebar.mdwn
sitemap.mdwn
special_remotes.mdwn	Add link to pCloud special remote.	2014-06-30 15:05:33 +03:00
summary.mdwn
sync.mdwn
testimonials.mdwn
thanks.mdwn	update	2014-06-10 16:16:57 -04:00
tips.mdwn
todo.mdwn	link to roadmap	2014-03-31 15:16:35 +00:00
transferring_data.mdwn
trust.mdwn
upgrades.mdwn
users.mdwn
videos.mdwn	back to https clone url for downloads.kitenet.net; fixed	2014-04-30 20:59:15 -04:00
walkthrough.mdwn	remove setup_git page	2014-05-18 11:26:11 -04:00