git-rebase

问题 I am having problems with a rebase, here is my setup: I have a remote git repo, and a local master branch which should mirror on the remote repo, I always branch off of my local master branch. To update my local master I perform git fetch; git rebase <remote> Once this has been completed I switch to my development branch git checkout my_dev_branch , and then run git rebase master . This has been working great. But I have just performed git fetch; git rebase <remote>; and got Cannot rebase:

问题 I created a feature branch from master branch. After that there is a commit [F1] from feature branch. [F1] -- Feature Branch / [M1]-[M2] -- Master Branch After that, feature branch is merged in master branch, and there are two more commits [M3] and [M4] in master branch. [F1] -- Feature Branch / \ [M1]-[M2]-[F1]-[M3]-[M4] -- Master Branch Now I added two more commits to feature branch. [F1]-[F2]-[F3] -- Feature Branch / \ [M1]-[M2]-[F1]-[M3]-[M4] -- Master Branch At this time, should I first

问题 I had done five commits and I wanted to make them all into one commit before pushing them. For some reason I decided to try doing this by a different means than I usually use. FWIW: I was attempting to follow the instructions here http://gitready.com/advanced/2009/02/10/squashing-commits-with-rebase.html . I'll put a lot of detail below but you might want to skip down to the bottom of the question where I put the output of git reflog because I suspect that's what's significant here. So here's

问题 Can I squash a range of commits for a local feature/topic branch using rebase that does not include the most recent commit? This is for commits that I want to prepare before they get merged and pushed to a public repo. I was working quickly and made a bunch of minor changes with poor titles and descriptions that I want to squash into two or three separate logical commits with a great comments. Can I select a range of commits between 329aed9 and af39283 that could be at any point in this

问题 One issue I run into with long rebases is having to resolve redundant conflicts. Say I have a branch with a sequence of commits that keeps modifying a function, and the final commit removes the function entirely. When I do rebase master , Git naively applies each of the commits in turn. That means I need to resolve each of these commits with the tip of master - even though ultimately that work is wasted. What's a good way to deal with this situation? Perhaps I should just generate a single

问题 So I've run into an issue with git where when I rebase or cherry pick a specific commit, I will get much more information than is in that specific commit. That issue is outlined really nicely in this question here: Am I misunderstanding git cherry-pick? And that is all well and good, I understand that it is picking up history because the commit I want depends on that history being there. What I don't get is how to get around it. I really don't want cherry pick to apply all of that history,

问题 I have 2 branches A and B. Both have diverged from master with lots of different commits, and the master has moved ahead. What i want to do is replace all changes of B with A. i.e., B should have exactly the same code as A. I tried using rebase/merge. Even -Xtheirs while rebasing B, but always running into loads of conflicts. i tried git checkout B git reset --hard A as given in How to copy one branch to another regardless changes? but this gave this- Your branch and 'origin/B' have diverged,

问题 I am trying to connect two independent commit trees into one repository. Initially I have: A--B--C--D (master1) E--F--G--H (master2) \ I--J (somebranch) These tree have no common ancestor and are independent of each other (different files and directories). I want to rebase both master2 and somebranch (may be multiple branches in fact) onto master1. It's easy to rebase just single branch with: #simple reabse: git checkout master2 git git rebase master1 which would give me: A--B--C--D (master1)

问题 I have a codebase that used to be managed with SVN, but is now managed with git. When the code was migrated to git, the history was lost. I have managed to recover the SVN-history, and am now trying to git-rebase the more recent commits over the top. I have two branches, git-commits , which contains the commits since the migration to git, and svn-commits which contains the older history. Each branch contains over 3000 commits. I have found that the following command builds the new history on

问题 Reading about git workflows, I was wondering about the appropriateness of history rewriting. My workflow, and I imagine that of many others, is this: Take Github repository, let's call this rep1 Make a fork, that'll be rep2 git clone it locally to work with, that's rep3 Make changes, commit to rep3 Once I am finished, push to rep2 and ask others for feedback before making a PR As I get feedback, it seems like I would want to do some rebasing and squashing, as often the feedback are minor