Top "Rebase" questions

Git: How to rebase and squash commits from branch to master?

I'm trying to rebase and squash all my commits from current branch to master. Here is what I'm trying to …

git branch rebase squash

Git rebase failing

I'm trying to rebase the work of a colleague. First, I get a ton of conflicts where <<<&…

git github version-control git-rebase rebase

Git: Pulling a rebased branch

Let me describe my situation: Mr Blond and Mr Orange are working on branch A that branches out of the …

git push rebase pull

How to rebase one Git repository onto another one?

I had one Git repository (A) which contains the development of a project until a certain point. Then I lost …

git merge repository rebase

In Mercurial what's the difference between hg graft and hg rebase

I know Rebase is a (bundled) extension, while Graft is a core feature (that replaced the Transplant (bundled) extension). graft …

mercurial rebase

Using Source Tree, rebase with conflict, rebase doesn't work after conflict resovled

I'm using SourceTree as my git tool on Windows. I have a main branch and a feature branch and I …

git rebase atlassian-sourcetree merge-conflict-resolution

How to skip "Loose Object" popup when running 'git gui'

When I run 'git gui' I get a popup that says This repository currently has approximately 1500 loose objects. It then …

git garbage-collection rebase git-gui git-gc

How to move some changeset to a new branch in mercurial

I want to move a changeset from one branch to another. Basically, I currently have: A -> B -&…

mercurial branch rebase

How do I rebase while skipping a particular commit?

Is there a way to rebase a branch onto another while skipping a particular (conflicting) commit on the other branch? …

git rebase git-rebase git-interactive-rebase

Git - Moving Pushed Commits to a Different Branch

My boss decided recently to try out an outsourcing group "for increased capacity" as we modify an existing application to …

git github rebase git-rebase