From: Matthew Fortune <Matthew.Fortune@imgtec.com>
To: Phil Muldoon <pmuldoon@redhat.com>, gdb <gdb@sourceware.org>
Subject: RE: Personal branches and restrictions with GIT repository
Date: Thu, 28 May 2015 10:11:00 -0000 [thread overview]
Message-ID: <6D39441BF12EF246A7ABCE6654B02353210632C0@LEMAIL01.le.imgtec.org> (raw)
In-Reply-To: <5566E465.3080909@redhat.com>
> git checkout master; git pull; git checkout users/pmuldoon/c++compile;
> git merge master; git push
>
> This just makes my branch = Master + my changes. It does not, of course,
> affect Master in any way.
If the long term aim is to submit the code to master you may find it
easier to rebase and force push to your personal branch. I'm assuming
force push to a personal branch is allowed.
This keeps all your commits at the top too. This method works well until
you have multiple contributors but with some practice it is possible to
work as a group with rebase+force push.
Matthew
next prev parent reply other threads:[~2015-05-28 10:11 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-28 9:48 Phil Muldoon
2015-05-28 10:11 ` Matthew Fortune [this message]
2015-05-28 13:44 ` Joel Brobecker
2015-05-28 14:03 ` Phil Muldoon
2015-06-30 20:19 ` Joel Brobecker
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=6D39441BF12EF246A7ABCE6654B02353210632C0@LEMAIL01.le.imgtec.org \
--to=matthew.fortune@imgtec.com \
--cc=gdb@sourceware.org \
--cc=pmuldoon@redhat.com \
/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