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: Thu, 4 Jun 2020 15:24:07 -0700
Message-ID: <CFD1B036-1198-4D40-95AD-860EE67C0506@getmailspring.com> (raw)
In-Reply-To: <CAPweEDxGLYbpPs7Ju9iMXWYD6iq-HunNCCL8LgSvazjyu8Chig@mail.gmail.com>
On Jun 4 2020, at 4:02 am, Luke Kenneth Casson Leighton <lkcl@lkcl.net> wrote:
> On Thu, Jun 4, 2020 at 4:46 AM Cole Poirier <colepoirier@gmail.com> wrote:
>>
>> 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.
>
> btw, another thing: if you're constantly running into commit
> conflicts, it means that you're "panicking and omg omg i can't
> possibly commit this i need to leave it a few days because i'm not
> confident omg it might not work might damage something omg omg argh
> argh"
>
> do a small change, commit it immediately, push it immediately.
>
> do another small change, commit it immediately, push it immediately.
>
> if you were working last night, and committed something without
> pushing it, you'll now find that you have another conflict to resolve,
> because i've replaced all of the long signal names with the
> convenience variables.
>
> l.
Not to worry, you helped me break the bad habit of not committing
immediately a few weeks ago :) Was just that we were working on the same
file within 15 min of each other.
Cole
_______________________________________________
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
2020-06-04 3:46 ` Cole Poirier
2020-06-04 11:02 ` Luke Kenneth Casson Leighton
2020-06-04 22:24 ` Cole Poirier [this message]
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=CFD1B036-1198-4D40-95AD-860EE67C0506@getmailspring.com \
--to=colepoirier@gmail.com \
--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