Git can be challenging, but here are a few git commands that might be helpful on a daily basis.(Shortcuts work using Oh-My-Zsh)
Rebase
git rebase -i master
or grbi master
will attempt to add all the changes in master to your current branch. This is typically done right before pushing upstream and opening up a pull request. While rebasing, there may be some merge conflicts you need to handle. If so, run git
…