Skip to content

Instantly share code, notes, and snippets.

@jatin33
Created December 26, 2019 13:36
Show Gist options
  • Save jatin33/dac197f42805715272df0de9fc1c5c6f to your computer and use it in GitHub Desktop.
Save jatin33/dac197f42805715272df0de9fc1c5c6f to your computer and use it in GitHub Desktop.
Steps for hassle free Git workflow (battle tested)
Step 1. Go to master
Step 2. git fetch origin master
Step 3. git rebase origin/master
Step 4. Make your new branch
Step 5. git rebase master
Step 6. make your changes and commit
Step 7. Go to master
Step 8. Repeat Step 2 and 3
Step 9. Checkout your branch again
Step 10. repeat step 5
Step 11. squash commits and force push if multiple commits else push your changes if you have only one commit
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment