Repository for INSA NXP cup
Every folder titled source_[...]
is a version of the code. One should only put the *.c and the *.h of the project, not the entire folder !
[...] Is a keyword or a_small_sentence describing this version in particular (e.g. "source_dangerously_fast
" or "source_safest
").
Small survival kit for everyone :
Get here and follow the installer's instructions. One should avoid using github desktop client ;)
git clone https://github.com/INSA-GEI/insa-nxpcup-1.git
cd insa-nxpcup-1
git pull
If it doesn't work, save your changes elsewhere, and retry with
git stash #Cancels all your changes in the repo
git pull #Try pulling again
Upload as often as possible. Most errors here appear when working un un-updated code.
git commit -a #Prepare a commit with all updated files, ignoring new files.
git push #Sends the previous commit on this repo
NB : While commiting, use Esc :wq Enter
. A good commit message is brief, and completes the following statement : This commit will ....
Do not use branches yet ! Your are in branch master, nothing should be done here Select a valid branch:
git checkout int_team_1: Integration branch for team 1
git checkout int_team_2: Integration branch for team 2
team work should use int_team_x branch as their main branch and integrate inside every stable work. Use development branch for your work in progress.
Old branchs: git checkout stable : stable branch (Obsolete) git checkout dev : work in progress (Obsolete)