rebase

I want to extend on another question I had: Merge two Git repositories and keep the master history I have succeeded in merging 2 different repo's into one repo. I needed a rebase to do this successfully. The master is correct, but I also want to keep the merge history . Is this possible? I have 2 repositories: https://github.com/DimitriDewaele/RepoA https://github.com/DimitriDewaele/RepoB This is the result after rebasing. The times of the top repo are the rebase-time. The original date is lost! https://github.com/DimitriDewaele/RepoMerged This is how I did it: # Assume the current directory

I used git-svn to create a git mirror of an SVN repository. The structure inside the SVN was a little off-standard, so git created a branch that has no common commit with the master branch. A---B---C topic D---E---F---G master I know that commit A is based off commit E and I'm pretty positive that I've fixed the issues causing git not to recognize that fact (using filter-branch ). What I want to do is re-attach topic to the master branch, setting E as the parent of A : A---B---C topic / D---E---F---G master git-rebase doesn't seem to work for me because the diff for commit A lists the creation

I wanted to have a simple solution to squash two merge commits together during an interactive rebase. My repository looks like: X --- Y --------- M1 -------- M2 (my-feature) / / / / / / a --- b --- c --- d --- e --- f (stable) That is, I have a my-feature branch that has been merged twice recently, with no real commits in between. I don't just want to rebase the my-feature branch since it is a published branch of its own, I just want to squash together the last two merge commits into one (haven't published those commits yet) X --- Y ---- M (my-feature) / / / / a --- ... -- f (stable) I tried:

I'm rebasing in git, and one conflict I get is 'both added' - that is, exactly the same filename has been added independently in my branch, and in the branch I'm rebasing on. git status tells me: # Unmerged paths: # (use "git reset HEAD <file>..." to unstage) # (use "git add/rm <file>..." as appropriate to mark resolution) # # both added: src/MyFile.cs My question is, how do I resolve this? Must I use a merge tool or is there a way I can do it just from the commandline? If I git rm src/MyFile.cs , how does git know which file version I want to remove and which I want to keep? CB Bailey If you

I have a git branch (called v4), that was made from master just yesterday. There were a couple of changes to master, that I want to get into v4. So, in v4, I tried to do a rebase from master, and one file keeps screwing things up: a one-line text file, that contains the version number. This file is app/views/common/version.txt , which before rebasing contains this text: v1.4-alpha-02 Here's what I'm doing: > git rebase master First, rewinding head to replay your work on top of it... Applying: new version, new branch error: patch failed: app/views/common/version.txt:1 error: app/views/common