Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix #145: Document working with upstream #146

Merged
merged 1 commit into from
Jun 21, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions docs-private/GitHub.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# GitHub

This project `enrollment-server-wultra` is a downstream project of `enrollment-server`.


## Setup a remote repository

```shell
git remote add upstream [email protected]:wultra/enrollment-server.git
```

See [Configuring a remote repository for a fork](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/configuring-a-remote-repository-for-a-fork) for details.


## Merge upstream

```shell
git checkout -b issues/merge-upstream
git fetch upstream
git merge upstream/develop
git push -u origin issues/merge-upstream
```