diff --git a/docs/dev/ToolChain.md b/docs/dev/ToolChain.md index 391955d6bb..6f3ea30eb7 100644 --- a/docs/dev/ToolChain.md +++ b/docs/dev/ToolChain.md @@ -63,10 +63,13 @@ This is required by the Eclipse process for checking for intellectual property ( **Before commencing these steps, check with your supervisor** -* Check [CONTRIBUTING.md](https://github.com/eclipse/winery/blob/master/CONTRIBUTING.md) and carefully read the instructions -* 🡒 Create an account **WITH THE SAME EMAIL THEN USED FOR THE COMMITS** (can also be checked in [gitk]) +### Formal Requirements + +* 🡒 Create an account **WITH THE SAME EMAIL AS USED FOR THE COMMITS** (can also be checked in [gitk]) * Sign the Contributor Agreement electronically -* Steps to prepare Pull Request: + +### Git Steps: Ensure that a single commit is created + 1. `git fetch upstream` - fetches all updates from https://github.com/eclipse/winery ("upstream") to the local git storage 2. `git merge upstream/master` - merges all updates from upstream to the local branch 3. (Resolve merge conflicts) - required if there are conflicting changes