Commit d02589a2 authored by Bednárek David RNDr. Ph.D.'s avatar Bednárek David RNDr. Ph.D.
Browse files


parent ea41a6f9
# Cecko Ref # Cecko Skeleton
The reference solution of Cecko. The skeleton of Cecko.
### Merging changes from the Skeleton repository
In each local copy, create the skeleton_master branch to mirror the state of the skeleton:
git remote add upstream
git fetch upstream master:skeleton_master
Repeat the fetch every time Skeleton repository is updated,
then merge the changes to the local master:
git merge skeleton_master
See also [Creating your Cecko repository](doc/
### Publishing skeleton updates back to the Skeleton repository
**Put all updates to the skeletal parts to separated commits.**
These commits shall not contain any changes to the reference solution.
Switch to the skeleton_master branch, cherry-pick the skeleton updates,
switch back to the master and merge them back to the local master:
git checkout skeleton_master
git cherry-pick <commit>...
git checkout master
git merge skeleton_master
Check the results in the git Log.
Push the skeleton_master changes to the Skeleton repository:
git push upstream skeleton_master:master
## Getting Started ## Getting Started
...@@ -48,4 +8,3 @@ git push upstream skeleton_master:master ...@@ -48,4 +8,3 @@ git push upstream skeleton_master:master
* [Creating your Cecko repository](doc/ * [Creating your Cecko repository](doc/
* [Building Cecko](doc/ * [Building Cecko](doc/
* [Running and debugging Cecko](doc/ * [Running and debugging Cecko](doc/
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment