Introduction

SWAN is a software package owned by Delft University of Technology (TUD).

The source code is available on TU Delft GitLab and is distributed under GNU GPL v3 license.

For further information, please refer to the official SWAN website and the official SWAN documentation.

Repository https://github.com/Deltares-research/SWAN_TUD contains copies of SWAN created by TUD.

Repository https://github.com/Deltares/swan is a fork of https://github.com/Deltares-research/SWAN_TUD and contains a SWAN version modified by Deltares. The TUD is not responsible for this modified version of SWAN.

Merging TUD updates

In https://github.com/Deltares-research/SWAN_TUD.git:

1. Commit updates to main

In https://github.com/Deltares/SWAN.git:

1. (Only once:) git remote add upstream https://github.com/Deltares-research/SWAN_TUD/.git
2. Create and checkout a merge-branch
3. git fetch upstream
4. git merge upstream/main --strategy-option theirs
5. Resolve conflicts
6. Create PullRequest to merge into "Deltares/SWAN"-main, NOT INTO "Deltares-research/SWAN_TUD"-main (which is the default)