[libre-riscv-dev] CI passes for soc.git!!!

[Luke Kenneth Casson Leighton]

On Tuesday, April 7, 2020, Jacob Lifshay <programmerjake at gmail.com> wrote:

>
> Turns out that a later commit on master fixed it, so I pushed my
> changes to master and deleted the fix-tests branch.


ok cool.

i suspect it was the git submodules.

i believe it may be essential to do submodule updates then individual
separate commit of .gitmodules.

one way to do this: by committing groups of files *not* with git commit -a
but explicitly listing them

then finally the last commit with .gitmodules only

if a commit includes both files *and* an alteration to .gitmodules then
merging breaks.

frickin nuisance.  lots of people have given up using submodules because of
this

must research it properly.

l.




-- 
---
crowd-funded eco-conscious hardware: https://www.crowdsupply.com/eoma68