On 6/10/20 12:00 PM, Andreas Schwab wrote:
On Jun 10 2020, Nathan Sidwell wrote:
needed 'origin' -- eg 'git merge origin master'
That's an octopus merge. I don't think you want that.
ah. Somehow I convinced myself that was how to merge from master, but I
guess my formulation resulted in o
On Jun 10 2020, Nathan Sidwell wrote:
> needed 'origin' -- eg 'git merge origin master'
That's an octopus merge. I don't think you want that.
Andreas.
--
Andreas Schwab, sch...@linux-m68k.org
GPG Key fingerprint = 7578 EB47 D4E5 4D69 2510 2552 DF73 E780 A9DA AEC1
"And now for something compl
On Wed, Jun 10, 2020 at 8:38 AM Nathan Sidwell 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, pulli
On 6/10/20 11:38 AM, Nathan Sidwell 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 ma
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-pare
