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 one of those octopus arms either being
a nop (origin/branch/HEAD?) or the same as the other
(origin/master/HEAD?). Given how my attempt at picking a point on
master went, I speculate the latter?
nathan
--
Nathan Sidwell
