From: Mark H Weaver <mhw@netris.org>
To: Federico Beffa <beffa@ieee.org>
Cc: Guix-devel <guix-devel@gnu.org>
Subject: Re: wip-gobject-introspection
Date: Sat, 17 Jan 2015 16:38:52 -0500 [thread overview]
Message-ID: <87a91hjdeb.fsf@netris.org> (raw)
In-Reply-To: <CAKrPhPP559a=aPRxT3Vd5+UBWJ7KFX2qZm4NVhqa5=5q2OYSMw@mail.gmail.com> (Federico Beffa's message of "Sat, 17 Jan 2015 19:57:58 +0100")
Federico Beffa <beffa@ieee.org> writes:
> On Sat, Jan 17, 2015 at 6:32 PM, Mark H Weaver <mhw@netris.org> wrote:
>> At this point, it would be good to rebase (not merge) the
>> 'wip-gobject-introspection' branch on current master. Presently, the
>> branch is based on master before core-updates was merged, which means a
>> considerably different core system than what we currently have.
>
> I would like to double check if I'm the only one having done any
> commits to wip-gobject-introspection branch (even local, not pushed
> ones. This is because the git manual warns people away from rebasing
> branches which have been made public and on which somebody else has
> done some work. So, I would like to make sure I don't mess up with
> anyone.
You're right to be wary of rebasing public branches, but I think it's
okay with short-lived experimental branches like this. If it turns out
that someone else has done work on it, the situation is easily remedied.
> If I understand correctly this is the command I would issue from the
> wip-gobject-introspection branch:
>
> git rebase master
Yes. It will need help rebasing your 'eudev' commits. As with 'git
merge', it will insert merge conflict markers which you must fix up
yourself. Then 'git add <files>' and 'git rebase --continue'.
Then, after some testing, it would be good to push it to savannah.
Because of the rebase, you'll have to delete the branch on savannah and
then remake it, as follows:
git push origin :wip-gobject-introspection # delete it on savannah
git push origin wip-gobject-introspection # push the new one
Thanks!
Mark
next prev parent reply other threads:[~2015-01-17 21:39 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-14 19:48 wip-gobject-introspection Federico Beffa
2015-01-14 20:51 ` wip-gobject-introspection Ludovic Courtès
2015-01-15 8:12 ` wip-gobject-introspection Federico Beffa
2015-01-16 20:33 ` wip-gobject-introspection Ludovic Courtès
2015-01-17 17:32 ` wip-gobject-introspection Mark H Weaver
2015-01-17 18:57 ` wip-gobject-introspection Federico Beffa
2015-01-17 21:38 ` Mark H Weaver [this message]
2015-01-17 22:51 ` wip-gobject-introspection Ludovic Courtès
2015-01-18 9:44 ` wip-gobject-introspection Federico Beffa
2015-01-18 17:26 ` wip-gobject-introspection Federico Beffa
2015-01-18 18:03 ` wip-gobject-introspection Federico Beffa
2015-01-18 18:45 ` wip-gobject-introspection Federico Beffa
2015-01-25 18:22 ` wip-gobject-introspection Federico Beffa
2015-01-25 23:42 ` wip-gobject-introspection Mark H Weaver
2015-01-26 2:26 ` wip-gobject-introspection Mark H Weaver
2015-01-26 8:11 ` wip-gobject-introspection Federico Beffa
2015-01-26 9:18 ` wip-gobject-introspection Andreas Enge
2015-01-26 20:20 ` wip-gobject-introspection Ludovic Courtès
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=87a91hjdeb.fsf@netris.org \
--to=mhw@netris.org \
--cc=beffa@ieee.org \
--cc=guix-devel@gnu.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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.