55 commits

Author	SHA1	Message	Date
Joey Hess	fb51d99951	merge conflict resolution now working ... Avoid MVar deadlock issue, which I don't understand. Have not taken the time to debug it fully, because it turns out I don't need to resolve merge conflicts when a new branch ref is written... I think. Ensure the git-annex branch is merged when doing a manual pull. Otherwise it can get out of sync, since git-annex normally only merges it once per run.	2012-06-27 20:50:50 -04:00
Joey Hess	59b5266ad1	actually fetch from remote when doing a manual pull ... forgot to do this	2012-06-27 20:30:04 -04:00
Joey Hess	783bee285f	automatic conflict resolution for assistant	2012-06-27 20:06:21 -04:00
Joey Hess	05c4dfb941	fixup merges now done when needed	2012-06-25 20:16:30 -04:00
Joey Hess	0b146f9ecc	reorg threads	2012-06-25 16:10:24 -04:00

Renamed from Assistant/Merger.hs (Browse further)