[Libre-soc-dev] daily kanban 2020-12-15
Jacob Lifshay
programmerjake at gmail.com
Wed Dec 16 08:45:27 GMT 2020
On Wed, Dec 16, 2020, 00:23 Luke Kenneth Casson Leighton <lkcl at lkcl.net>
wrote:
> On Wed, Dec 16, 2020 at 3:39 AM Jacob Lifshay <programmerjake at gmail.com>
> wrote:
> >
> > today:
> > fill out more of https://libre-soc.org/openpower/sv/svp_rewrite/svp64/
> > Had fun trying to resolve merge conflicts caused by both Luke and I
> > editing the same file at the same time.
>
I made a bunch of changes in a few min, by which time you had also pushed
changes.
>
> always commit. don't leave things uncommitted for even a few hours.
> that's when conflicts occur.
Jacob
More information about the Libre-soc-dev
mailing list