Memocast - Node.js application Changes and Updates:
- Hi level overview
- Main components details
- Configuration details
- Special Promo Service for Pandemic
-
Create a ticket which describes what exactly you are going to do
-
In the ticket, create a Merge Request. The MR creates a development brunch for you automatically
-
In your development
git
folder:$ git pull $ git checkout <the freshly created branch>
-
Do all the necessary changes
-
Commit changes when necessary, adding a ticket number prefix plus the change's description:
$ git commit -am "[123] Completed development of new feature"
-
If commit triggers CI build verify that the commit compiled successfully. Fix all build problems
-
In the Merge Request, assign a code reviewer who will review and approve your changes
-
Work with the reviewer until all findings being resolved and the MR has been approved by the reviewer
-
When the development of the ticket is done, synchronize with the latest changes on
master
by rebasing your local git repo to the latest master:$ git pull $ git rebase -i origin/master <... possible conflict resolution actions ...>
-
Safely push your changes back to the branch:
$ git push --force-with-lease
-
Merge your approved changes back to
master
withdelete branch
but withoutsquashing