From: "Peter Harris" <git@peter.is-a-geek.org>
To: "Junichi Uekawa" <dancer@netfort.gr.jp>
Cc: git@vger.kernel.org
Subject: Re: Main branch being maintained with 'git am', how do mere mortals interact without too much conflicts?
Date: Sat, 10 Jan 2009 09:47:17 -0500 [thread overview]
Message-ID: <eaa105840901100647y70b53ae0w495af69b7281cae7@mail.gmail.com> (raw)
In-Reply-To: <87vdsntnyd.dancerj%dancer@netfort.gr.jp>
On Sat, Jan 10, 2009 at 6:11 AM, Junichi Uekawa wrote:
> I am thinking of recommending the users to create a branch
...
> and throw away their branches when they are included upstream.
Yes, with a patch based workflow, this is almost required; all of the
commits will at least have different committer information.
There's nothing wrong with this approach.
> Something tells me the problem is that I'm probably using a workflow
> that resembles SVN too much, and users aren't used to branches yet.
> Has anybody found this to be a problem, or better yet, is there a
> better workflow?
If you need the commits to be identical, and you don't mind your email
consisting of a binary blob attachment, you can ask your contributors
to send you a bundle instead of a series of patches. "git help bundle"
for details.
Peter Harris
next prev parent reply other threads:[~2009-01-10 14:48 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-01-10 11:11 Main branch being maintained with 'git am', how do mere mortals interact without too much conflicts? Junichi Uekawa
2009-01-10 14:47 ` Peter Harris [this message]
2009-01-10 16:29 ` Sitaram Chamarty
2009-01-10 14:47 ` Santi Béjar
2009-01-10 16:18 ` Sitaram Chamarty
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=eaa105840901100647y70b53ae0w495af69b7281cae7@mail.gmail.com \
--to=git@peter.is-a-geek.org \
--cc=dancer@netfort.gr.jp \
--cc=git@vger.kernel.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.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).