Rebase head to smartgit code#

This may not be an issue, but sometimes you would have really appreciated including that specific fix that your team merged, or getting rid of that huge dependency that slows you down every time you compile. First of all, if you’re working on your branch long enough, you may end up out-of-sync with the base branch for days or weeks. However, a few things are also a bit off here. Since the critical part where Git combines (or merges) your changes with the ones from the base branch only happens once, you will only need to deal with eventual conflicts once - at the merge step. There’s nothing wrong with this workflow in particular, you don’t have to bother about what your coworkers are doing so you can focus on your own work. Your pull request finally gets accepted and is merged into the base branch (C10)Īnd from there, your history becomes a bit more complex:.Meanwhile, other commits are merged to the base branch (C8 and C9).You push your updated feature branch to the centralized shared repo (C6 and C7 on the following schema).You make some changes and commit the fixes locally.

Rebase head to smartgit code#

Code reviewers have found a few bugs and typos in your first commits and your tests are not passing.

However, in an imperfect world, here’s what might come next: You end up with a nice, clean branch, such as:

Wait for your tests to pass and to gather feedback from your peersįrom there, everything is great.

Open a new Pull Request for `my-new-feature`.

Push the feature branch to the centralized shared repo.

Do some work and commit the changes to the feature branch.

Create a new “feature” branch called `my-new-feature` from a base branch, such as `master` or `develop`.

A Git workflow common to services such as GitHub or Gitlab is as follows: Merging branch is the most common way to integrate changes between two Git branches. First, as a way to integrate and exchange your work between two branches (like `merge` does), but also as a history rewriting tool. Confused? Don’t worry! This blog post is about different uses of `rebase`. Truth is, it’s more than that - `rebase` is a completely different set of tools that intersect with the goals achieved by `merge`.

Git `rebase` is one of those commands that you may have heard of as a substitute for `merge`.