-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #146 from /issues/145-document-upstream
Fix #145: Document working with upstream
- Loading branch information
Showing
1 changed file
with
22 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 | ||
``` |