Hi Eliot,
On 1 December 2017 at 07:14, Eliot Miranda eliot.miranda@gmail.com wrote:
Hi Nicolas, Hi All,
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.
If I come here again, what is the simplest way of resolving conflicts such that
- one has committed many local changes
- one can pull a version that one wants to displace one's current version
on a file-by-file basis Why isn't there a pull -merge -take-theirs? How does one construct that?
Just bumped into this again reviewing old posts. I've never used it, but as far as I'm aware, there is such a "take theirs" merge strategy... https://git-scm.com/docs/merge-strategies
Note that "theirs" is not a "merge strategy" but a "merge strategy option" for the "recursive merge strategy" which is the default for single-branch merges. So presumably the following would have suited your situation...
$ git merge -X theirs origin/Cog
btw, just for general info, pay attention to the two entries for "ours" on that page, one as a "recursive merge strategy option" and one as a "merge strategy".
cheers -ben
On Thu, Nov 30, 2017 at 3:03 PM, GitHub noreply@github.com wrote:
Branch: refs/heads/Cog Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: 4a29fb8a59e7a7d484ab04c8acde558beb42baad https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/4a2 9fb8a59e7a7d484ab04c8acde558beb42baad Author: Eliot Miranda eliot.miranda@gmail.com Date: 2017-11-30 (Thu, 30 Nov 2017)
Log Message:
Merge with Nicolas' VMMaker.oscog- nice.2281 generation.
Commit: 8de3e4aa1f87eab4a7ce28ae3e0880ae4dac177f https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/8de 3e4aa1f87eab4a7ce28ae3e0880ae4dac177f Author: Eliot Miranda eliot.miranda@gmail.com Date: 2017-11-30 (Thu, 30 Nov 2017)
Changed paths: M src/plugins/BitBltPlugin/BitBltPlugin.c
Log Message:
Merge with Nicolas' VMMaker.oscog- nice.2281 generation.
Commit: f590af1093325c7ddb5af03c41ea775bf3158510 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/f59 0af1093325c7ddb5af03c41ea775bf3158510 Author: Eliot Miranda eliot.miranda@gmail.com Date: 2017-11-30 (Thu, 30 Nov 2017)
Log Message:
Merge branch 'Cog' of https://github.com/OpenSmalltalk/opensmalltalk-vm into Cog Merge with Nicolas' VMMaker.oscog- nice.2281 generation.
Commit: 106fdde6feb856e172ac6f59d33d033a6da34531 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/106 fdde6feb856e172ac6f59d33d033a6da34531 Author: Eliot Miranda eliot.miranda@gmail.com Date: 2017-11-30 (Thu, 30 Nov 2017)
Changed paths: M src/plugins/BitBltPlugin/BitBltPlugin.c
Log Message:
BitBltPlugin as per VMMaker.oscog-eem.2285 BitBltSimulation>>copyLoop: Fix type inference of variable unskew in BitBlt >> copyLoop Strength reduce the loop split for combinationRule = 3 so that less tests are done in the inner loop and so trhat when combinstionRule = 3 mergeFn is never used. Use an explicit type declaration for unskew instead of trickier relying on type inference
Compare: https://github.com/OpenSmalltalk/opensmalltalk-vm/compare/ 8879e2e55826...106fdde6feb8
-- _,,,^..^,,,_ best, Eliot