Basic Workflow

FROM MASTER BRANCH:

// create a new branch and navigate to it
git checkout -b branch_name
// stage the current directory
git add .
// commit the staged files with a message
git commit -m "message"
// navigate to the branch master
git checkout master
// pull all changes from the remote branch
git pull origin master
// merge the changes committed in the previously created branch into the current branch (master)
git merge --no-ff branch_name
// push the changes to the remote repository
git push origin master