Skip to content

Commit

Permalink
resolved merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
cmeesters committed Dec 5, 2023
2 parents 85a4d12 + 716e014 commit 74338c9
Show file tree
Hide file tree
Showing 13 changed files with 457 additions and 836 deletions.
17 changes: 12 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,21 @@ This repository contains (better: will contain) teaching material to teach for

all tailored for HPC systems.

## Getting started
## Getting started / Onboarding

If you want to participate in the development: Just notify us (issue) and we will add your github account.
If you want to participate in the development: Just notify us (issue) and we will add your github account. Alternatively, you may fork the repo and create PRs from there.

For every issue:
Workflow for pull requests:

- create or take an issue to work on (you may assign others or no one). Issues ought to be as specific as possible. We may break "big issues" into smaller ones
- create a branch `"<shortname>_<issue_number>"`. Only in rare case (closely related issues) bundle the work on issues into one branch. The parent branch should always be "main"
- commit your work to branch
- push to origin (your own fork of the snakemake-hpc-teaching-material repository)
- create a [pull request](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request)
- assign arbitrary reviewer (or wait until someone takes on this pull reqeust)
- (s.o. else) perform review (switch to branch and try; check the quality)
- merge and delete source branch

- create a branch `"<shortname>_<issue_number>"`
- do a pull (request)

## Progress

Expand Down
Binary file added images/logos/UNI_Bonn_Logo_Standard+HPCA.pdf
Binary file not shown.
Binary file added images/logos/UNI_Bonn_Logo_Standard_RZ.pdf
Binary file not shown.
Loading

0 comments on commit 74338c9

Please sign in to comment.