3 Commits

Author	SHA1	Message	Date
Sean McGivern	59dd9e576b	Use Repository#fetch_ref	2016-08-30 16:23:45 +01:00
Sean McGivern	1bda1e62de	Fix resolving conflicts on forks ... Forks may not be up-to-date with the target project, and so might not contain one of the parent refs in their repo. Fetch this if it isn't present.	2016-08-30 11:56:11 +01:00
Sean McGivern	ba327e69ec	Move resolving code to ResolveService	2016-08-12 23:24:48 +03:00