Explore >> Select a destination
|
You are here 
|
andrew.yurisich.com | ||
| | | | |
www.integralist.co.uk
|
|
| | | | | Introduction git merge git merge --no-ff --edit git reset Force the merge commit git branch --contains Losing useful history git merge --squash git rebase git rebase --interactive git rebase --onto git format-patch Conclusion Introduction Imagine I have a master branch with one commit: 75eb1cb - (origin/master) README This is a single README.md file with the following content: - A: 1 Now imagine I have a branch from master called feat/foo and in that branch I've made 3 additional commits: | |
| | | | |
www.integralist.co.uk
|
|
| | | | | Introduction Rebase before merge Example (Bonus) Modifying content within an interactive rebase Introduction This is a quick post to cover a GitHub workflow that is utilised by our specific team (Frameworks) here at BBC News. The basis of our workflow is this: Open a GitHub PR (Pull Request) by creating a new feature branch from master Make feature specific changes and request a code review If given a "thumbs up", this means the PR author is allowed to handle merging the PR The merge process requires a s... | |
| | | | |
kewah.com
|
|
| | | | | Practices to write a meaningful commit message. | |
| | | | |
haacked.com
|
|
| | | A git alias to clean up gone branches. Even ones that have been squashed and merged. | ||
