Git Process - Githubissues

red-lipped-batfish-scad / HugelMaps

MIT License

6 stars 2 forks source link

Git Process #14

Open cmlooff opened 2 years ago

cmlooff commented 2 years ago

Getting started

Pushing changes to the main repo

[ ] 1. 'Git checkout dev' (locally switch to dev branch)
[ ] 2. 'Git pull origin dev' (Pull updates of dev down to your local system)
[ ] 3. 'Git checkout [your branch] (switch back to your branch locally)
[ ] 4. 'Git merge dev' (Brings dev into your local branch)
[ ] 5. Resolve conflicts or :q if there aren't any
[ ] 6. 'Git push origin ' (Push merged branch up to github)
[ ] 7. Create a pull request in github from ==> dev
[ ] 8. Repeat as needed
[ ] 9. When ready to publish main, do step 7 but from dev => main