git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: Main branch being maintained with 'git am', how do mere mortals interact without too much conflicts?

From
PHPeter Harris <git@peter.is-a-geek.org>
Date
Jan 10, 2009, 14:47 UTC
Message-ID
<eaa105840901100647y70b53ae0w495af69b7281cae7@mail.gmail.com>
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
Previous: Junichi UekawaNext: Sitaram Chamarty
Message 2 of 5 in “Main branch being maintained with 'git am', how do mere mortals interact without too much conflicts?”
  1. Junichi UekawaJan 10, 2009
  2. Peter HarrisJan 10, 2009
  3. Sitaram ChamartyJan 10, 2009
  4. Santi BéjarJan 10, 2009
  5. Sitaram ChamartyJan 10, 2009

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.