All about git.
master: stable, should always passdevelop: development, merge of topic branches, should mostly pass[developer name]: topic branch, for isolated development
git clone https://github.com/richelbilderbeek/djog_unos_2018
Then probably, you want to go into that folder:
cd djog_unos_2018
git status
This will show you which branch you are on, and which files you have changed.
Do this within the djog_unos_2018 folder.
git checkout develop
Do this within the djog_unos_2018 folder.
- Note: there was a time when using
git checkout -t origin/developwas recommended. This may have been unnecessarily complex
If your branch is for example richel, do:
git checkout richel
Do this within the djog_unos_2018 folder.
- Note: there was a time when using
git checkout -t origin/richelwas recommended. This may have been unnecessarily complex
git pull
Do this within the djog_unos_2018 folder.
git add --all :/
git commit -m "Something brilliant"
git push
Do this within the djog_unos_2018 folder.
Tips and examples:
- Use
progress #123in the commit message if you worked on/finished Issue 123 - Please do not use
fix #XXXinstead ofprogress #XXXin your commit message, this will prevent the issue from getting closed before being tested - Use
[skip ci]at the end of the commit message if Travis does not need to check it
First update develop:
git checkout develop
git pull
Then merge it with yours:
git checkout richel
git merge develop
git push
If you get merge conflicts and just want to use the develop version, use:
git checkout richel
git merge -X theirs develop
git push
⚠️ Only mediors and seniors are allowed to do this!
Go to develop:
git checkout develop
git pull
git pull should not do much! If it does, merge develop with your branch first.
If and only if develop was already up to date, merge it with yours:
git merge richel
git push
