From: "Ana Guerrero Lopez" <ana.guerrero@collabora.com>
To: kernelci@groups.io
Subject: merging kernelci-build with lava-ci
Date: Thu, 6 Sep 2018 21:47:26 +0200 [thread overview]
Message-ID: <20180906194726.GA16832@delenn> (raw)
Hi!
We discussed in one of the weekly meetings the idea of merging kernelci-build
with lava-ci. I took a quick look at this and as hoped, they can be both merged
easily.
The easiest seems to merge kernelci-build (~200 commits) into lava-ci (~800 commits),
the only conflict is the README.md file so this file needs to be removed
from kernelci-build before the merge. Then both repositories can be merged
with merge --allow-unrelated-histories.
The steps I followed:
$ git clone https://github.com/kernelci/lava-ci-staging && cd lava-ci-staging
$ git remote add kernelci-build https://github.com/kernelci/kernelci-build-staging.git
$ git fetch kernelci-build/master
$ git merge --allow-unrelated-histories kernelci-build/master
And exactly the same procedure works for the staging repositories kernelci-build-staging
and lava-ci-staging. You can browse the resulting repositories at:
https://gitlab.collabora.com/ana/kci.lava-ci-staging
https://gitlab.collabora.com/ana/kci.lava-ci
Is there any objection against doing the merge of this two repositories next week?
Do you have any preference for the name of the new resulting repository? For the sake
of suggesting something, what about just "kernelci" or maybe "kernelci-core"?
Cheers,
Ana
next reply other threads:[~2018-09-06 19:47 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-06 19:47 Ana Guerrero Lopez [this message]
2018-09-06 22:13 ` [kernelci] merging kernelci-build with lava-ci Kevin Hilman
2018-09-07 8:49 ` Matt Hart
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=20180906194726.GA16832@delenn \
--to=ana.guerrero@collabora.com \
--cc=kernelci@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