Top "Rebase" questions

Changing the starting point of a branch in a Version Control System.

git rebase and git push: non-fast forward, why use?

I have a branch that should be available to other contributors and that should constantly stay up to date with …

git merge rebase
git rebase after previous git merge

I have the following situation: I created a clone(Y) from a main repository(X), because there were many people …

git merge rebase git-rebase
Rebasing in smartgit "git-am is in progress"

I will try to explain the problem that I have. I have used the rebase option via git bash many …

git rebase git-rebase smartgit
Error with git rebase ("could not apply...")

I'm the administrator of the GitHub repository https://github.com/plison/opendial. I would like to reduce the number of …

git github git-svn rebase git-rebase
How to properly rebase in SourceTree?

SourceTree 1.6.4.0 on Windows 7. Let's say the following is my starting point: C <- master / - A - B <…

git rebase atlassian-sourcetree
git rebase, keeping track of 'local' and 'remote'

When doing a git rebase, I often have difficulty working out what is happening with the 'local' and 'remote' when …

git conflict rebase
git pull *after* git rebase?

I have a feature branch, and a master branch. Master branch has evolved and I mean to have those updates …

git rebase
Git rebase will not continue after a delete/modify conflict

I'm in the middle of a rebase of my master to a stage branch git checkout stage git rebase master …

git version-control rebase git-rebase
Edit a merge commit with git rebase

In Git when I have commits eg. A - B - C and I want to edit the B commit, …

git rebase
git rebase interactive: squash merge commits together

I wanted to have a simple solution to squash two merge commits together during an interactive rebase. My repository looks …

git merge interactive rebase squash