Branching Strategy - Real-Dev-Squad/website-learn GitHub Wiki

Know your Branch

We'll be having 3 permanent branches.

  • Master (main) - Basically, this will be our production branch.
  • Staging - Stable features are merged here. Also, this is the only branch we'll be raising PR (Pull Request) to master.
  • Develop - Multiple features, in development, will co-exist.

We'll also be having a short-lived branch.

  • feature branch - We will be cutting a branch from Master(source of truth), and call it our feature branch.
    Suppose, you're working on a feed. Nomenclature for this can be feature/feed.

Workflow

Suppose, you start working on a feature 🎉

  1. You'll cut your feature branch from master, which is our source of truth.
  2. Work on your feature. Test it in local.
  3. Raise a PR for develop branch and have it reviewed by the concerned person, if not the AO(App Owner).
  4. Once they merge your PR, confirm your changes on develop deployed url.

Side Note: You should be keeping your feature branch pure all the time. It should not be corrupted.

  1. Raise a PR from your feature branch to staging, and have it merged.
  2. Raise a PR from Staging to master, and have it merged 🎉

Congratulations, on contributing on the project 😃


Now, look out for more issues at Website learn - Issues

Happy hacking 💻

⚠️ **GitHub.com Fallback** ⚠️