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

git rebase conflicts?

From
KKAJed <kailey.joanette@gmail.com>
Date
Feb 3, 2011, 21:06 UTC
Message-ID
<1296767213445-5990493.post@n2.nabble.com>

If I'm rebasing the history on a project, basically squashing all commits to a point, why are there conflicts?

Keep in mind this is a flat history. Basically the history came from SVN and now I'm trying to squash that down to "this was the stable migration from SVN".

So howcome when rebasing it causes a conflict? Some times its files that are missing, or being deleted. Some times I can see it's because an empty directory (at least that makes sense with git).

Any other suggestions? What I really want is there to either be NO conflicts, or simply conflict resolve with the correct (newer) file.

-- 
View this message in context: http://git.661346.n2.nabble.com/git-rebase-conflicts-tp5990493p5990493.html
Sent from the git mailing list archive at Nabble.com.
Message 1 of 1 in “git rebase conflicts?”
  1. KAJedFeb 3, 2011

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.