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

Rebasing with merges and conflict resolutions

From
R. Tyler Ballance <tyler@monkeypox.org>
Date
Mar 26, 2010, 03:11 UTC
Message-ID
<20100326031111.GB27737@kiwi.sharlinx.com>
I am trying to use rebase to straighten out a couple topic branches' histories
and running into nothing but troubles and I'm wondering if:
   a) I'm doing it wrong (highly likely)
   b) what I want is not possible
   c) banana!

Two contributors worked in tandem on a particular project, constantly merging back and forth between each other creating a history of 118 commits total with 37 of them being merge commits, 7 of those merge commits having conflict resolutions involved.

I would /like/ to rebase those into a more linear revision history, but I
can't seem to find any set of commands that doesn't have me:
   a) Manually re-doing every conflict resolution and merge (git rebase -p master)
   b) Drastically diverging from the original topic branch and entering some
      sort of mergeless hell (git rebase master)

Is it even possible to straighten this out without a massive rework of these commits?

In the future, is there a better way for two developers to work in the same back-and-forth fashion (code ping pong!) without leading to *heavily* merged histories that are unpossible to untangle?

Halp!
Cheers,
-R. Tyler Ballance
--------------------------------------
 Jabber: rtyler@jabber.org
 GitHub: http://github.com/rtyler
Twitter: http://twitter.com/agentdero
   Blog: http://unethicalblogger.com
Next: Johannes Sixt
Message 1 of 5 in “Rebasing with merges and conflict resolutions”
  1. R. Tyler BallanceMar 26, 2010
  2. Johannes SixtMar 26, 2010
  3. R. Tyler BallanceMar 26, 2010
  4. Jon SeymourMar 26, 2010
  5. Jon SeymourMar 26, 2010

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.