From: Luke Kenneth Casson Leighton <lkcl@lkcl.net>
To: Libre-RISCV General Development <libre-riscv-dev@lists.libre-riscv.org>
Subject: Re: [libre-riscv-dev] daily kan-ban update 03jun2020
Date: Thu, 4 Jun 2020 01:32:14 +0100
Message-ID: <CAPweEDy2pa63GJDPG7Ak_0KqgyQ6gbXknJARaCwEKH9fTbRgOQ@mail.gmail.com> (raw)
In-Reply-To: <A4AF384A-E5CA-413E-87FC-338016E6F5E7@getmailspring.com>
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 :)
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.
_______________________________________________
libre-riscv-dev mailing list
libre-riscv-dev@lists.libre-riscv.org
http://lists.libre-riscv.org/mailman/listinfo/libre-riscv-dev
next prev parent reply index
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-03 12:50 Luke Kenneth Casson Leighton
2020-06-03 13:28 ` Tobias Platen
2020-06-03 23:58 ` Cole Poirier
2020-06-04 0:03 ` Luke Kenneth Casson Leighton
2020-06-04 0:09 ` Cole Poirier
2020-06-04 0:32 ` Luke Kenneth Casson Leighton [this message]
2020-06-04 3:46 ` Cole Poirier
2020-06-04 11:02 ` Luke Kenneth Casson Leighton
2020-06-04 22:24 ` Cole Poirier
2020-06-04 0:58 ` Jacob Lifshay
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAPweEDy2pa63GJDPG7Ak_0KqgyQ6gbXknJARaCwEKH9fTbRgOQ@mail.gmail.com \
--to=lkcl@lkcl.net \
--cc=libre-riscv-dev@lists.libre-riscv.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Libre RISC-V Mailing list Archives (accessible via public-inbox)
Archives are clonable: git clone --mirror https://inbox.libre-soc.org/libre-riscv-dev
Example config snippet for mirrors
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git