Simple Docs
  • What is Simple?
    • 📕Background
    • 📱Simple app features
    • 🖥️Dashboard features
    • 👩‍⚕️Who uses Simple?
    • 🏥Clinic workflows
  • Try it out
  • Training materials
  • Contact
    • Contact us
    • Customer support
      • Bug priority definitions
  • Reports
    • What we report
    • Building custom reports
  • Engineering
    • Data dictionary & API
    • Android
      • Conventions
      • Deploying to Play Store
      • Headers sent from the app
    • Backend
      • Audit logs
      • Major flows
    • Localization
      • Android
      • Server
      • Adding/Editing translations for a project
      • Reviewing a translation
    • Technical Hiring Process
  • Design
    • Design
    • User testing
      • Key moments in the user journey
      • User tests
      • Conducting user tests
  • Onboarding
    • Code of conduct
    • Acronyms
    • Glossary
    • Recommended reading
    • Digital principles
  • Elsewhere
    • Simple.org
    • Source code (GitHub)
Powered by GitBook
On this page
  • Naming branches in git
  • Daily branches
  • Release branches

Was this helpful?

Export as PDF
  1. Engineering
  2. Android

Conventions

We try to stick to these conventions as much as possible. Think of them as strong guidelines!

PreviousAndroidNextDeploying to Play Store

Last updated 8 days ago

Was this helpful?

Naming branches in git

Since we using as our workflow, we try to merge code daily and not have any long running "feature branches".

Daily branches

Daily branches have the developer's initials, the date, and a small title. For e.g.: Asha Kumari making a branch on 12th April to work on "updated search algorithm", should name the branch something like ak/12apr/update-search-algo. This gently nudges the developer to merge the branch in a day or two, since this is just a convention and not enforced in any manner.

Release branches

Release branches are automatically cut when we create a new release from Tramline, new branch will be named r/release followed by the date on which the release is triggered. For example, the release branch cut on 10th December 2018 will be named r/release/2018-12-10 .

trunk based development