rebase

I am working on a project that has two branches: master and feature The feature branch was created some time ago and has numerous commits. Since the feature branch was created there have been a couple of commits to master At this point when I go to rebase off of master I get conflicts. I resolve them and then rebase --continue . Then I get conflicts again, and again resolve and rebase --continue . This happens over and over and many times it seems like they are the same conflicts that are appearing. In my mind here is what is happening: master(commits)->a->b feature(commits)->c->d->e->f->g

We currently have 2 branches: /repo/branch/current_version /repo/branch/next_version current_version is a branch where all developers currently works. We starting a next version and created next_version branch from some point in current_version, while work on current_version is still continuing. In next_version we do some development and in next months the branch will become our main one, where all development will be done. Since there's development on current_branch, we thought periodically (say once per 2 weeks) to rebase next_version. This in order to keep both branch in sync, so when all

Suppose I have a chain of local git branches, like this: master branch1 branch2 | | | o----o----o----A----B----C----D I pull in an upstream change onto the master branch: branch1 branch2 | | A----B----C----D / o----o----o----o | master Now I rebase branch1, giving me this: branch2 | A----B----C----D / o----o----o----o----A'---B' | | master branch1 Note that because of rebasing branch1, commits A and B have been rewritten as A' and B'. Here's my problem: now I want to rebase branch2. The obvious syntax is git rebase branch1 branch2 , but that definitely does not work. What I want it to do is

I'm trying to find the source of a bug that's come up since a commit in the past day on a long lived branch (which will be released much much later) called feature-x . There's a bug though. I find behavior that I don't expect from my script which might have been introduced in any of the commit's up till now, specifically because features of master are used heavily in feature-x, but less so on Master itself. To test this behavior, I have to run my script, dependent.pl. But when bisect jumps half way down the code, my script doesn't exist on Master and so it's impossible to test. I believe this

Is there a way to rebase a branch onto another while skipping a particular (conflicting) commit on the other branch? For example, I want to rebase mybranch onto master , but master contains a commit that will conflict with the commits in master, so I prefer to undo that commit completely. -o-o-o-o-o-x-o-o-o-o master | o-o-o-o mybranch x marks the conflicting commit. Sergey K. Use interactive rebase: git rebase -i master An editor will open and you will have a list of commits like this: pick b8f7c25 Fix 1 pick 273b0bb Fix 2 pick 6aaea1b Fix 3 Just delete the commit you want to skip. It will be

Recently I had an issue where I was given a patch for an assignment, as the professor had changed the code to add new functionality. Unfortunately, I had already put the original codebase in git and had made lots of changes and commits already. The workflow I used to apply the patch is as follows: git checkout <hash_of_where_patch_should_go> git checkout -b patch_branch git apply patch git add ./* && git commit -m "applying patch" git rebase master patch_branch //Fix merge conflicts git rebase patch_branch master This worked wonderfully, but my question is this: is this the 'correct' way to