On Wed, Jun 10, 2020 at 8:38 AM Nathan Sidwell <nat...@acm.org> wrote: > > I'm trying to merge master to devel/c++-modules, as I usually do. But > there's an ICE creeping in, so I'm attempting incremental merges to > figure out what happened. > > I thought 'git merge --no-commit origin $HASH' would do that, pulling > $HASH out of master's commit history (git tree --first-parent). But > this doesn;t seem to be working. In particular I thought that if $HASH > matched the last master commit that I merged from, the result would be a > nop. It isn't :( > > How do I update my branch to some non-HEAD point on master?
I have been using git to maintain non-trivial changes over a long period of time. These are what I do 1. Break my changes into as many small pieces as possible. Each commit should be built without any regressions. 2. Use "git rebase commit-on-master" to sync with commits on master on a daily/weekly/monthly basis. Small pieces make rebasing much easier. -- H.J.
