[Libre-soc-bugs] [Bug 676] FORTRAN MAXLOC SVP64 example

[bugzilla-daemon at libre-soc.org]

https://bugs.libre-soc.org/show_bug.cgi?id=676

--- Comment #35 from Luke Kenneth Casson Leighton <lkcl at lkcl.net> ---
(In reply to Jacob Lifshay from comment #34)

> rebase one branch on the other, no need to mess with master.

not when there are inter-related developments and conflicts in all three.

> > rebase screwed up. a *lot*.
> 
> I basically always run git log before pushing, it helps catch stuff like
> that.

long story. half a dozen conflicts spread across both branches.

-- 
You are receiving this mail because:
You are on the CC list for the bug.