<div dir="ltr">Hi Eliot,<br><div class="gmail_extra"><br><div class="gmail_quote">On 1 December 2017 at 07:14, Eliot Miranda <span dir="ltr"><<a href="mailto:eliot.miranda@gmail.com" target="_blank">eliot.miranda@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"> <br><div dir="ltr">Hi Nicolas, Hi All,<div><br></div><div> ugh. Merging with git is simply too confusing. I f**ed up royally and have wasted an afternoon getting merged to change one file. Nicolas, apologies for all the noise. I had started this monong to debug the issue. I discovered it,fixed it, regenerated sources and was about to push when I discovered you had beaten me to it. But since I had committed the regenerated sources (which were mixed with a few others) I had many conflicts with your regeneration. I don't see an easy way of pulling your changes, obliterating my regeneration, while keeping the small set of changes that remained meaningful. It should be easy but I found it horribly time consuming. Anyway, apologies for the bug, for obscuring your commit with my own merge attempts, and for whining.</div><div><br></div><div>If I come here again, what is the simplest way of resolving conflicts such that</div><div>- one has committed many local changes</div><div>- one can pull a version that one wants to displace one's current version on a file-by-file basis</div><div>Why isn't there a pull -merge -take-theirs? How does one construct that?</div></div></blockquote><div><br></div><div>Just bumped into this again reviewing old posts.</div><div>I've never used it, but as far as I'm aware, there is such a "take theirs" merge strategy...</div><div><div><a href="https://git-scm.com/docs/merge-strategies">https://git-scm.com/docs/merge-strategies</a><br></div></div><div><br></div><div><div>Note that "theirs" is not a "merge strategy" but a "merge strategy option" </div><div>for the "recursive merge strategy" which is the default for single-branch merges.</div></div><div>So presumably the following would have suited your situation...</div><div><br></div><div>$ git merge -X theirs origin/Cog</div><div><br></div><div><br></div><div>btw, just for general info, pay attention to the two entries for "ours" on that page,</div><div>one as a "recursive merge strategy option" and one as a "merge strategy".</div><div><br></div><div>cheers -ben </div><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div class="gmail_extra"><br><div class="gmail_quote">On Thu, Nov 30, 2017 at 3:03 PM, GitHub <span dir="ltr"><<a href="mailto:noreply@github.com" target="_blank">noreply@github.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"> <br> Branch: refs/heads/Cog<br>
Home: <a href="https://github.com/OpenSmalltalk/opensmalltalk-vm" rel="noreferrer" target="_blank">https://github.com/OpenSmallt<wbr>alk/opensmalltalk-vm</a><br>
Commit: 4a29fb8a59e7a7d484ab04c8acde55<wbr>8beb42baad<br>
<a href="https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/4a29fb8a59e7a7d484ab04c8acde558beb42baad" rel="noreferrer" target="_blank">https://github.com/OpenSmallta<wbr>lk/opensmalltalk-vm/commit/4a2<wbr>9fb8a59e7a7d484ab04c8acde558be<wbr>b42baad</a><br>
Author: Eliot Miranda <<a href="mailto:eliot.miranda@gmail.com" target="_blank">eliot.miranda@gmail.com</a>><br>
Date: 2017-11-30 (Thu, 30 Nov 2017)<br>
<br>
Log Message:<br>
-----------<br>
Merge with Nicolas' VMMaker.oscog- nice.2281 generation.<br>
<br>
<br>
Commit: 8de3e4aa1f87eab4a7ce28ae3e0880<wbr>ae4dac177f<br>
<a href="https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/8de3e4aa1f87eab4a7ce28ae3e0880ae4dac177f" rel="noreferrer" target="_blank">https://github.com/OpenSmallta<wbr>lk/opensmalltalk-vm/commit/8de<wbr>3e4aa1f87eab4a7ce28ae3e0880ae4<wbr>dac177f</a><br>
Author: Eliot Miranda <<a href="mailto:eliot.miranda@gmail.com" target="_blank">eliot.miranda@gmail.com</a>><br>
Date: 2017-11-30 (Thu, 30 Nov 2017)<br>
<br>
Changed paths:<br>
M src/plugins/BitBltPlugin/BitBl<wbr>tPlugin.c<br>
<br>
Log Message:<br>
-----------<br>
Merge with Nicolas' VMMaker.oscog- nice.2281 generation.<br>
<br>
<br>
Commit: f590af1093325c7ddb5af03c41ea77<wbr>5bf3158510<br>
<a href="https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/f590af1093325c7ddb5af03c41ea775bf3158510" rel="noreferrer" target="_blank">https://github.com/OpenSmallta<wbr>lk/opensmalltalk-vm/commit/f59<wbr>0af1093325c7ddb5af03c41ea775bf<wbr>3158510</a><br>
Author: Eliot Miranda <<a href="mailto:eliot.miranda@gmail.com" target="_blank">eliot.miranda@gmail.com</a>><br>
Date: 2017-11-30 (Thu, 30 Nov 2017)<br>
<br>
Log Message:<br>
-----------<br>
Merge branch 'Cog' of <a href="https://github.com/OpenSmalltalk/opensmalltalk-vm" rel="noreferrer" target="_blank">https://github.com/OpenSmallta<wbr>lk/opensmalltalk-vm</a> into Cog<br>
Merge with Nicolas' VMMaker.oscog- nice.2281 generation.<br>
<br>
<br>
Commit: 106fdde6feb856e172ac6f59d33d03<wbr>3a6da34531<br>
<a href="https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/106fdde6feb856e172ac6f59d33d033a6da34531" rel="noreferrer" target="_blank">https://github.com/OpenSmallta<wbr>lk/opensmalltalk-vm/commit/106<wbr>fdde6feb856e172ac6f59d33d033a6<wbr>da34531</a><br>
Author: Eliot Miranda <<a href="mailto:eliot.miranda@gmail.com" target="_blank">eliot.miranda@gmail.com</a>><br>
Date: 2017-11-30 (Thu, 30 Nov 2017)<br>
<br>
Changed paths:<br>
M src/plugins/BitBltPlugin/BitBl<wbr>tPlugin.c<br>
<br>
Log Message:<br>
-----------<br>
BitBltPlugin as per VMMaker.oscog-eem.2285<br>
BitBltSimulation>>copyLoop:<br>
Fix type inference of variable unskew in BitBlt >> copyLoop<br>
Strength reduce the loop split for combinationRule = 3 so that less tests are<br>
done in the inner loop and so trhat when combinstionRule = 3 mergeFn is never<br>
used. Use an explicit type declaration for unskew instead of trickier relying<br>
on type inference<br>
<br>
<br>
Compare: <a href="https://github.com/OpenSmalltalk/opensmalltalk-vm/compare/8879e2e55826...106fdde6feb8" rel="noreferrer" target="_blank">https://github.com/OpenSmallta<wbr>lk/opensmalltalk-vm/compare/<wbr>8879e2e55826...106fdde6feb8</a><br></blockquote></div><br><br clear="all"><div><br></div>-- <br><div class="gmail-m_2873990243289334764gmail_signature"><div dir="ltr"><div><span style="font-size:small;border-collapse:separate"><div>_,,,^..^,,,_<br></div><div>best, Eliot</div></span></div></div></div>
</div>
<br></blockquote></div><br></div></div>