Rebasing and what does one mean by rebasing pushed commits

by

To understand this, we need to understand a bit about how git works. A git repository is a tree structure, where the nodes of the tree are commits. Here’s an example of a very simple repository:
When you fork

it has four commits on the master branch, and each commit has an ID (in this case, a, b, c, and d). You’ll notice that d is currently the latest commit (or HEAD) of the master branch.
enter image description here

Here, we have two branches: master and my-branch. You can see that master and my-branch both contain commits a and b, but then they start to diverge: master contains c and d, while my-branch contains e and f. b is said to be the “merge base” of my-branch in comparison to master — or more commonly, just the “base”. It makes sense: you can see that my-branch was based on a previous version of master.

So let’s say that my-branch has gone stale, and you want to bring it up to date with the latest version of master. To put it another way, my-branch needs to contain c and d. You could do a merge, but that causes the branch to contain weird merge commits that make reviewing the pull request much more difficult. Instead, you can do a rebase.

enter image description here

When you rebase, git finds the base of your branch (in this case, b), finds all the commits between that base and HEAD (in this case, e and f), and re-plays those commits on the HEAD of the branch you’re rebasing onto (in this case, master). Git actually creates new commits that represent what your changes look like on top of master: in the diagram, these commits are called e′ and f′. Git doesn’t erase your previous commits: e and f are left untouched, and if something goes wrong with the rebase, you can go right back to the way things used to be.

When many different people are working on a project simulateously, pull requests can go stale quickly. A “stale” pull request is one that is no longer up to date with the main line of development, and it needs to be updated before it can be merged into the project. The most common reason why pull requests go stale is due to conflicts: if two pull requests both modify similar lines in the same file, and one pull request gets merged, the unmerged pull request will now have a conflict. Sometimes, a pull request can go stale without conflicts: perhaps changes in a different file in the codebase require corresponding changes in your pull request to conform to the new architecture, or perhaps the branch was created when someone had accidentally merged failing unit tests to the master branch. Regardless of the reason, if your pull request has gone stale, you will need to rebase your branch onto the latest version of the master branch before it can be merged.

More Related Contents:

  1. Undoing a git rebase
  2. Git refusing to merge unrelated histories on rebase
  3. What is the difference between merge –squash and rebase?
  4. How to squash all git commits into one?
  5. Change first commit of project with Git? [duplicate]
  6. Insert a commit before the root commit in Git?
  7. What’s the difference between ‘git merge’ and ‘git rebase’?
  8. Combine the first two commits of a Git repository?
  9. Remove folder and its contents from git/GitHub’s history
  10. git rebase, keeping track of ‘local’ and ‘remote’
  11. Rebasing a branch including all its children
  12. How do I recover/resynchronise after someone pushes a rebase or a reset to a published branch?
  13. git cherry-pick says “…38c74d is a merge but no -m option was given”
  14. How to rebase many branches (with the same base commit) at once?
  15. How to squash my last x commits together?
  16. How do I squash my last N commits together?
  17. Can I make fast forwarding be off by default in git?
  18. git rebase and git push: non-fast forward, why use?
  19. Git push rejected “non-fast-forward”
  20. git pull –rebase lost commits after coworker’s git push –force
  21. How do I use `git rebase -i` after `git merge` without messing things up?
  22. Change old commit message using `git rebase`
  23. How to merge two branches without a common ancestor?
  24. How to fix commit order in GitHub pull requests, broken by git rebase?
  25. How to rebase one Git repository onto another one?
  26. Git: How to rebase to a specific commit?
  27. Is there a way to squash a number of commits non-interactively?
  28. Git rebase branch with all parent branches (or dependent sub-branches)
  29. How do I rebase a chain of local git branches?
  30. When will `git pull –rebase` get me in to trouble?

Leave a Comment