Branch Update Workflow

Erik A. Roberts edited this page Dec 14, 2017 · 9 revisions

Monthly (last Friday of each month), the branches should be merged in a particular manner:

  1. cd to dynasim repo: cd "path/to/repo"
  2. Unit test debug and proceed if no errors
  3. Update master from debug
    • git checkout master
    • Merge debug into master with git merge debug --no-commit, so that one can still edit the commit
    • Confirm master is production-ready
      • fix conflicts
      • check qsub* permissions are a+x
      • add hard copy of submodules, like MDD
      • remove any dev files, like demos/devDemos
      • git commit
  4. Update dev from debug
    • git checkout dev
    • git merge debug
    • fix conflicts, check qsub* permissions are a+x, and commit
  5. Update debug from updated dev
    • git checkout debug
    • git merge dev
    • fix conflicts, check qsub* permissions are a+x, and commit
  6. Push all changes: git push --all

At this point, master is now the same as the old debug branch, but with hard-copied submodules. Debug and dev should be identical. For the next month, debug branch will be tested and debugged, while dev is for new features. The average developer should be using debug, and adding features to dev.

You can’t perform that action at this time.
You signed in with another tab or window. Reload to refresh your session. You signed out in another tab or window. Reload to refresh your session.
Press h to open a hovercard with more details.