From: "Ard Biesheuvel" <ardb@kernel.org>
To: Sami Mujawar <sami.mujawar@arm.com>
Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>,
edk2-devel-groups-io <devel@edk2.groups.io>, nd <nd@arm.com>,
Leif Lindholm <quic_llindhol@quicinc.com>,
Michael D Kinney <michael.d.kinney@intel.com>
Subject: Re: Incorrect push to edk2-platforms
Date: Fri, 29 Jul 2022 13:18:14 -0700 [thread overview]
Message-ID: <CAMj1kXFxLckxUNegqFe1BQc0pN7FcQZQkP_i1+VQX-B=5Jx=SQ@mail.gmail.com> (raw)
In-Reply-To: <5ac96d33-d9bb-f6fa-e6c1-b17153b02fae@arm.com>
On Fri, 29 Jul 2022 at 13:13, Sami Mujawar <sami.mujawar@arm.com> wrote:
>
> Adding Leif and Mike.
>
> On 29/07/2022 08:54 pm, Sami Mujawar wrote:
> > Hi Ard,
> >
> > I have accidentally pushed a change to the edk2-platforms repo.
> >
> > The commit is
> >
> > 2faefb2bbcc8083e1bd28908c0b29b5d18595298 <Sami Mujawar> Merge branch
> > 'master' of github.com:/tianocore/edk2-platforms
> >
> > Appologies for the trouble. Can you advise on how this can be fixed,
> > please?
> >
I don't think there is anything that needs fixing here. We try to
avoid merge commits because a fully linear git history results in less
confusion when doing bisection, but there is nothing fundamentally
wrong with them.
next prev parent reply other threads:[~2022-07-29 20:18 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-29 19:54 Incorrect push to edk2-platforms Sami Mujawar
2022-07-29 20:13 ` Sami Mujawar
2022-07-29 20:18 ` Ard Biesheuvel [this message]
2022-07-29 20:20 ` Michael D Kinney
2022-07-29 20:27 ` Ard Biesheuvel
2022-07-29 20:40 ` [edk2-devel] " Michael D Kinney
2022-07-29 21:11 ` Sami Mujawar
2022-07-29 21:01 ` Sami Mujawar
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-list 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='CAMj1kXFxLckxUNegqFe1BQc0pN7FcQZQkP_i1+VQX-B=5Jx=SQ@mail.gmail.com' \
--to=devel@edk2.groups.io \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox