joeywang/git-workflow.md

Created October 24, 2024 21:48

Star (0) You must be signed in to star a gist
Fork (0) You must be signed in to fork a gist

Select an option

Learn more about clone URLs
Clone this repository at <script src="https://gist.github.com/joeywang/9c1d9722d8ac6851d2547d12519320bc.js"></script>
Save joeywang/9c1d9722d8ac6851d2547d12519320bc to your computer and use it in GitHub Desktop.

Download ZIP

Raw

git-workflow.md

flatten the commits in main/master
rebase feature branches
squash into one commit

git merge --squash branch_name

git rebase -i `git merge-base --fork-point master`

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment