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

Re: I'm trying to break "git pull --rebase"

From
Martin Langhoff <martin.langhoff@gmail.com>
Date
Feb 20, 2018, 22:21 UTC
Message-ID
<CACPiFCK_-qw72QgKziCWzSPJtDN+w1PrbDu5Qk1MVj220WKZ-A@mail.gmail.com>
In-Reply-To
<CAA7Zk=vWdEUnrfBcxCH6WAFH9Jss7T9_zK-zMnWbVO7B+2YySw@mail.gmail.com>
On Tue, Feb 20, 2018 at 5:00 PM, Julius Musseau <julius@mergebase.com> wrote:
> I was hoping to concoct a situation where "git pull --rebase" makes a
> mess of things.

It breaks quite easily with some workflows. They are all in the "don't do that" territory.

Open a long-lived feature-dev branch, work on it. Other folks are working on master. Merge master into feature-dev. Make sure some merges might need conflict resolution.

Reorg some code on master, move files around. Code some more on feature-dev branch. Merge master into feature-dev; the merge machinery will probably cope with the code move, file renames. If it doesn't, resolve it by hand.

Let all that simmer for a little bit.
Then try to rebase.
"Doctor, it hurts when I rebase after merging with conflict resolution... "
cheers,
m
Previous: Stefan Beller
Message 3 of 3 in “I'm trying to break "git pull --rebase"”
  1. Julius MusseauFeb 20, 2018
  2. Stefan BellerFeb 20, 2018
  3. Martin LanghoffFeb 20, 2018

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.