merge_request_wiki

• create new branch

git checkout -b branch_name

• commit your file

git status
git add filename_that_changed
git commit -m 'meaningful commit message'

i.e.

git commit -m 'remove endline spaces on demo isr lab'

• check available remotes

git remote -v
git remote add remote_name remote_address

i.e.

git remote add remote_name git@dante.isr.tecnico.ulisboa.pt:olima/isr_monarch_robot.git

• push to your fork, to your branch

git push remote branch

i.e.

git push oscar remove-space-oscar

• create merge request

make sure button remove branch after merge is clicked

IF IT DOES NOT GET ACCEPTED (keep adding, commiting and pushing to the same fork/branch)

ONLY IF IT GETS ACCEPTED CONTINUE

• checkout to main branch

git checkout branch_name

i.e.

git checkout kinetic

• pull from upstream

git pull remote branch

i.e.

git pull origin kinetic

• push to your fork

git push remote branch

i.e.

git push oscar kinetic

• remove your local branch

git branch -D branch_name

i.e.

git branch -D remove-space-oscar