6 Commits

Author	SHA1	Message	Date
Bryan Housel	3bbf31902a	Add accessor to get conflict details from iD.actions.MergeRemoteChanges	2014-12-29 22:47:44 -05:00
Bryan Housel	0c881ef9f2	merge ways with non-overlapping changes to nodelists	2014-12-13 22:50:29 -05:00
Bryan Housel	977e29cfdb	Most iD.actions.MergeRemoteChanges features complete ... (todo: merging ways where nodelist has not been reordered)	2014-12-11 23:52:53 -05:00
Bryan Housel	dc1221b8ba	pass graphs instead of entities to iD.actions.MergeRemoteChanges ... (realized that I will need to compare more stuff from the local and remote graphs in order to merge ways/relations)	2014-12-10 00:12:32 -05:00
Bryan Housel	eff18cb257	add tests for iD.actions.MergeRemoteChanges	2014-12-09 00:59:25 -05:00
Bryan Housel	3e97bd7d89	stub out iD.actions.MergeRemoteChanges	2014-12-06 22:11:54 -05:00