Skip to content

Home

Jump to bottom
Anton Karakochev edited this page Oct 14, 2020 · 5 revisions

Welcome to the code_party_kp wiki!

Coding guidelines

  • One feature branch per exercise (e.g Exercise1).
  • Everyone creates their own branches branching from it and works in them.
  • After those branches are merged to Exercise1 create a PR to merge Exercise1 into main and add the teachers as reviewers.

HowTo Synch with homework repository

  1. (ONLY INITIALLY, NOT EVERY TIME) add Repository as upstream
git remote add upstream https://github.com/Systems-Development-and-Frameworks/homework.git
  1. fetch changes from upstream
git fetch upstream
  1. switch to main branch
git checkout main
  1. merge from upstream (homework repository).

Note that --allow-unrelated-histories is needed since we will also be updating main with our own code.

git merge upstream/main --allow-unrelated-histories

for more info see this blog.

Clone this wiki locally