git-rebase

Here is my transcript from trying to merge my bugfix branch onto my master branch in preparation to push it upstream. There have been some upstream changes pulled into master since the bugfix branch was created, and it now refuses to rebase. The files it throws errors on are not diffed when opened. no files have been added, removed or renamed. Nothing is ignored and nothing is untracked or staged or unstaged. I'm completely stumped as to why the rebase is failing. I'm on OS X 10.6.6 and git 1.7.4 .-(/Volumes/joshua/www/txfunds)-------------------------------------------------------------------

I have the following situation: I created a clone (Y) from a main repository(X), because there were many people working on Y we didn't do any rebase but only merge s. When we want to deliver( push ) Y to X we would like to do a rebase in order to have things nice and clean The problem is that when doing rebase we are asked to do all the merges that we already did in the previous merge steps. Is there a solution to this, beside the one that means actually re-doing the merges? I expected it to be pretty straightforward since we already solved the conflicting merges. Rebasing to get a "clean"

Our project has been using Git for a week or so now, and we're all enjoying it a lot (using it in a tight collaborative group turns out to be quite a different Git experience). To keep things as simple as possible, we do not do any rebasing or history modifications. But we did make a few mistakes in the first week. A few commits were made that shouldn't have been done, and we managed to merge a feature branch into the wrong integration branch (1.1 instead of 1.0). And we didn't find out about these things until they were long into our history. Now I see a lot of warnings about rewriting

My Git history looks like that : I would like to squash the purple commits into a single one. I don't want to see them ever again in my commit log. I've tried to do a git rebase -i 1 , but even though 1 is on the blue branch (cf. picture), I still see every commit on my purple branch. How can I completely remove the purple branch (from commit log) ? Do git rebase -i <sha before the branches diverged> this will allow you to remove the merge commit and the log will be one single line as you wanted. You can also delete any commits that you do not want any more. The reason that your rebase wasn't

I'm using git, and made a small commit followed by a large one. I decided to use git rebase to squash the two commits together before pushing them. (I've never done this before.) So I did: git rebase -i HEAD~2 This gave me my editor, where I chose to pick the earlier commit and squash the later one. When I saved, git said: error: cannot stat ' filename ': Permission denied Could not apply sha1 for later commit ... initial line of text for that commit Now: Neither commit appears when I do git log . git status tells me I'm "Not currently on any branch." One file is listed as modified and in the

I am in the middle of rebasing after a git pull --rebase . I have a few files that have merge conflicts. How can I accept "their" changes or "my" changes for specific files? $ git status # Not currently on any branch. # You are currently rebasing. # (fix conflicts and then run "git rebase --continue") # (use "git rebase --skip" to skip this patch) # (use "git rebase --abort" to check out the original branch) # # Changes to be committed: # (use "git reset HEAD <file>..." to unstage) # # modified: CorrectlyMergedFile # # Unmerged paths: # (use "git reset HEAD <file>..." to unstage) # (use "git