nordicmaterial2
1/31/2017 - 7:58 AM

GIT

GIT

//verify that you have the correct username:
git config --global user.name
//verify your account email:
git config --global user.email


//Go to the master branch to pull the latest changes from there:
git checkout master
// Download the latest changes in the project:
git pull REMOTE NAME-OF-BRANCH -u

//View the changes you've made
git status

//Add changes to commit
git add CHANGES IN RED
git commit -m "DESCRIBE THE INTENTION OF THE COMMIT"

//Send changes to gitlab.com
git push REMOTE NAME-OF-BRANCH

//Merge created branch with master branch
//(You need to be in the created branch.)
git checkout NAME-OF-BRANCH
git merge master

//Merge master branch with created branch
//(You need to be in the master branch.)
git checkout master
git merge NAME-OF-BRANCH