<div dir="ltr">On Thu, Jul 4, 2013 at 11:14 PM, Gavin Howard <span dir="ltr"><<a href="mailto:gavin.d.howard@gmail.com" target="_blank">gavin.d.howard@gmail.com</a>></span> wrote:<br><div class="gmail_extra"><div class="gmail_quote">
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">==== Questions ====<br>
<br>
Do any of the developers know what I might have done wrong in my<br>
merging? I can't figure it out. If there are conflicts, I resolve them<br>
with either "theirs-full" or "theirs-conflict". If there are any<br>
suggestions, please let me know.<br></blockquote><div><br></div><div>Hard to answer without digging into details.... One thing you can do is ask for a patch from your head to the trunk-head, create a clean branch-state, then hand-apply the diffs, not adding anything that doesn't look like your work. This will help fix any mis-merging while recovering useful code if there is some... THen you can pick up the pieces. Usually it's much faster to make the same code changes again, so this may-or-may-not be useful depending on the work involved.</div>
</div></div></div>