From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
To: buildroot@busybox.net
Subject: [Buildroot] OT: git workflow question
Date: Wed, 16 Dec 2009 20:37:28 +0100 [thread overview]
Message-ID: <20091216203728.1ddc624c@surf> (raw)
In-Reply-To: <hgb3a3$88l$1@ger.gmane.org>
Le Wed, 16 Dec 2009 16:53:24 +0000 (UTC),
Grant Edwards <grant.b.edwards@gmail.com> a ?crit :
> Since I had only changed the one file (and those changes had
> been merged into the master repository) I didn't bother trying
> to resolve the conflict -- I just blew away my repository and
> did a 'clone'.
>
> Here's my question: why was there a conflict?
Not sure why, Peter will probably give an explanation.
> Is this how git is supposed to work?
No. You should have made your changes in a separate branch instead of a
master branch. Then, you submit your patches. When they are merged, you
do "git pull" in your master branch. And then "git branch -d
yourbranch". If everything has been merged, "git branch -d" will
succeed, otherwise it will fail (and you can use "git branch -D" to
remove a branch that hasn't been merged).
This is at least how I'm contributing to Buildroot. Not necessarly the
cleanest way, I'm no git expert.
Thomas
--
Thomas Petazzoni, Free Electrons
Kernel, drivers and embedded Linux development,
consulting, training and support.
http://free-electrons.com
next prev parent reply other threads:[~2009-12-16 19:37 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-12-16 16:53 [Buildroot] OT: git workflow question Grant Edwards
2009-12-16 19:37 ` Thomas Petazzoni [this message]
2009-12-16 20:05 ` Grant Edwards
2009-12-16 20:20 ` Peter Korsgaard
2009-12-16 20:06 ` Markus Heidelberg
2009-12-17 21:40 ` Julien Boibessot
2009-12-16 19:56 ` Chris Packham
2009-12-16 20:00 ` Markus Heidelberg
2009-12-16 20:03 ` Grant Edwards
[not found] <mailman.5919.1260994066.28478.buildroot@busybox.net>
2009-12-18 8:08 ` Vellemans, Noel
2009-12-18 12:04 ` Lionel Landwerlin
2009-12-18 14:22 ` Chris Packham
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=20091216203728.1ddc624c@surf \
--to=thomas.petazzoni@free-electrons.com \
--cc=buildroot@busybox.net \
/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