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

Re: Dividing up a large merge.

From
Avery Pennarun <apenwarr@gmail.com>
Date
Jul 15, 2009, 01:32 UTC
Message-ID
<32541b130907141832r5217183wc6a0494d6d77bc06@mail.gmail.com>
In-Reply-To
<20090715011914.GA17100@huya.quicinc.com>
On Tue, Jul 14, 2009 at 9:19 PM, <davidb@quicinc.com> wrote:
Show 10 quoted lines
> On Tue, Jul 14, 2009 at 05:34:26PM -0700, Avery Pennarun wrote:
>> How about having one person do the merge, then commit it (including
>> conflict markers), then have other people just make a series of
>> commits removing the conflict markers?
>
> I guess this helps in some sense, but the intermediate result
> isn't going to build, and things like mergetool aren't going to
> work.  It's helpful for the individuals to have the full merge
> conflict available, or at least the stages of the files in
> question.

It sounds like you're going in circles a bit here. You want the full merge conflict available - but you want it to be able to build.

It sounds like the "git reset the unwanted subdirs" solution suggested earlier is the only option that will really work. You could simplify life for your co-workers by writing a script to automate the steps, I suppose.

You probably want all the individuals to use merge --squash, so that you don't mark the history as merged until you're done. Then you combine all their work at the end and mark the commit as done using 'git merge -s ours'.

Avery
Previous: Douglas CamposNext: Theodore Tso
Message 7 of 13 in “Dividing up a large merge.”
  1. davidb@quicinc.comJul 14, 2009
  2. Bryan DonlanJul 15, 2009
  3. davidb@quicinc.comJul 15, 2009
  4. Avery PennarunJul 15, 2009
  5. davidb@quicinc.comJul 15, 2009
  6. Douglas CamposJul 15, 2009
  7. Avery PennarunJul 15, 2009
  8. Theodore TsoJul 15, 2009
  9. Jakub NarebskiJul 15, 2009
  10. Theodore TsoJul 15, 2009
  11. Larry D'AnnaJul 15, 2009
  12. Daniel BarkalowJul 15, 2009
  13. davidb@quicinc.comJul 15, 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.