Re: [libre-riscv-dev] daily kan-ban update 03jun2020

From: Cole Poirier <colepoirier@gmail.com>
To: Libre-RISCV General Development <libre-riscv-dev@lists.libre-riscv.org>
Cc: Libre-RISCV General Development <libre-riscv-dev@lists.libre-riscv.org>
Subject: Re: [libre-riscv-dev] daily kan-ban update 03jun2020
Date: Wed, 3 Jun 2020 20:46:03 -0700
Message-ID: <DE69CBB7-67F9-41E3-9846-6864E35E0413@getmailspring.com> (raw)
In-Reply-To: <CAPweEDy2pa63GJDPG7Ak_0KqgyQ6gbXknJARaCwEKH9fTbRgOQ@mail.gmail.com>

On Jun 3 2020, at 5:32 pm, Luke Kenneth Casson Leighton <lkcl@lkcl.net> wrote:
> On Thu, Jun 4, 2020 at 1:09 AM Cole Poirier <colepoirier@gmail.com> wrote:
> 
>> Yes sorry about that, part was intentional, which I see now was clearly
>> a silly thing to do, the other part was that I managed to really mess up
>> the 'resolution' of merge conflicts.
> 
> your responsibility to sort out :)

I think I have, but we shall see...

> welcome to working on the same file.
> 
> suggestion: do regular "git pulls".  this doesn't work with rebase, so
> you have to use "git stash" followed by "git pull" followed by "git
> stash apply" and then work it out from there.
> 
> or you can use "git stash show -p {0}" (after doing "git stash list"
> to find the right one) prior to "git stash apply" and that will give
> you the diff before applying it.
> 
> which.... if you want, you can pipe that diff into a file, then use
> "patch", which has the advantage of putting rejected patches into
> ".rej" files, which you can then manually sort out.
> 
> l.

Ooooh, this is very cool, will be 'bookmarking' this for future use.

Cole

_______________________________________________
libre-riscv-dev mailing list
libre-riscv-dev@lists.libre-riscv.org
http://lists.libre-riscv.org/mailman/listinfo/libre-riscv-dev