Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
teaching
nswi098
Cecko
skeleton
Commits
d02589a2
Commit
d02589a2
authored
Oct 01, 2020
by
Bednárek David RNDr. Ph.D.
Browse files
Update README.md
parent
ea41a6f9
Changes
1
Show whitespace changes
Inline
Side-by-side
README.md
View file @
d02589a2
# Cecko
Ref
# Cecko
Skeleton
The reference solution of Cecko.
### Merging changes from the Skeleton repository
In each local copy, create the skeleton_master branch to mirror the state of the skeleton:
```
bash
git remote add upstream git@gitlab.mff.cuni.cz:teaching/nswi098/cecko/skeleton.git
git fetch upstream master:skeleton_master
```
Repeat the fetch every time Skeleton repository is updated,
then merge the changes to the local master:
```
bash
git merge skeleton_master
```
See also
[
Creating your Cecko repository
](
doc/Repository.md
)
### 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:
```
bash
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:
```
bash
git push upstream skeleton_master:master
```
The skeleton of Cecko.
## Getting Started
...
...
@@ -48,4 +8,3 @@ git push upstream skeleton_master:master
*
[
Creating your Cecko repository
](
doc/Repository.md
)
*
[
Building Cecko
](
doc/Building.md
)
*
[
Running and debugging Cecko
](
doc/Runnning.md
)
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment