/explore
|
You are here 
|
geoffrich.net | ||
| | | | |
williamdurand.fr
My git workflow involves creating a lot of short-lived branches (a.k.a. feature branches), switching between them and, sometimes, I need to rebase one of these branches. git rebase is a super useful git command and I recommend everyone to get more familiar with it (take a look at git rebase in depth for instance). |
|
| | | | | ||
| | | | |
felixrieseberg.com
You need to rebase a feature branch you worked on weeks ago. Merge conflicts everywhere. But: There's hope. Use "git merge --squash". |
|
| | | | | ||
| | | | |
dev.clintonblackburn.com
I sometimes work across multiple branches for a variety of reasons, but usually when breaking up larger changes into smaller chunks. Sometimes I want to rebase these smaller chunks on my master branch. This usually results in the following series of commands: |
|
| | | | | ||
| | | | |
sookocheff.com
This is something I often do but rarely remember the steps for. This post is intended to serve as a reminder for me and anyone else having the same question: how to add an upstream remote git repository. Start by forking the repository you are contributing to and cloning that repository to your local file system. In this example, we will use the Elasticsearch repository and assume you have cloned it locally. |
|
| | | |||
