Skip to content
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
11 changes: 11 additions & 0 deletions hail.md
Original file line number Diff line number Diff line change
Expand Up @@ -403,6 +403,17 @@ We try to keep our Hail fork as close as possible to the upstream repository. We
1. Get the upstream changes into a new branch:
Set SHA_HASH to the particular hash or upstream/main

Merge upstream/main

```bash
git fetch origin
git fetch upstream
git checkout -b draft-<month>
git merge --no-commit upstream/main
```

Merge up to a specific commit hash in the upstream

```bash
git remote add upstream https://github.com/hail-is/hail.git # One-time setup.

Expand Down
Loading