Sep 30, 2016
Git Workflow
Merging vs. Rebasing # The two essentially do the same thing. the difference is that rebase makes the history linear. This is good when you are developing on your own branches, but not good when we you working on public branch, Unable to resolve reference to #pitfalls from wiki/git-workflow.mdmore here
To merge or rebase master into a feature
git checkout feature git merge master # or.. a oneliner git merge master feature # say it in your head, git merge master into feature Rewriting history # keeping a clean history is important This code snippets will allow you to interactively update commits for a particular branch.
