ennovar git practice commands
######################### A Simple Workflow in Gitlab ###############################
### Requirements: ###
### ~> Suppose 'master' is the stable branch and production ready at 'origin' ###
### ~> Setup 'git mergetool' to your favorite editor by the following command ###
### ~> git config --global merge.tool <favorite-editor-difftool> ###
#####################################################################################
#~> (1) At 'master' do
git pull
#~> (2) Check how many branches are currently on the repo
git fetch
git branch -a
#~> (3) Check out the branch you are assigned to be working on
git checkout <some-branch-A>
#~> (4) Commit into it
git add <some-files>
git commit -m "<some-message>"
#~> (5) Check if master branch has any update before merging
git checkout master
git pull
#~> (6) Go back to your own branch you have been working on and merge with master
git checkout <some-branch-A>
git merge master
#~> (7) Resolve conflicts, talk with the lead if there's any, to abort do `git merge --abort`
#~> (8) Push to your remote branch
git push origin <some-branch-A>
#~> (9) Send a merge request to the lead developer through Gitlab GUI