Git: Best Practices - Spotify-Open-Recommendation-Engine/spotify-open-recommendation-engine GitHub Wiki

We're using Git to aggregate our work and do SCM. Here are some guidelines:

• Working on a task? Make a feature branch (usually off of main).
• Develop and test on your branch locally. (Check out the setup page for some quick steps to set up Anaconda and py4web.)
• When your changes are ready to merge, raise a pull request (PR). Request reviews.
• Once the PR is approved, merge it into main.

Notes:

• When someone merges a PR, don't forget to git pull main to grab the latest copy of code.
• Communication is key - if you're working on a task/branch, make sure you're communicating with the team so we don't duplicate effort!
• If you're working on/off of someone's in-progress changes (or modifying someone else's branch), communicate! We don't want to clobber each other with conflicting changes.