Skip to content

Commit

Permalink
Refine ToolChain
Browse files Browse the repository at this point in the history
  • Loading branch information
koppor committed May 7, 2018
1 parent 3fb39cd commit df4a6c5
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions docs/dev/ToolChain.md
Expand Up @@ -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
* <http://wiki.eclipse.org/Development_Resources/Contributing_via_Git> 🡒 Create an account **WITH THE SAME EMAIL THEN USED FOR THE COMMITS** (can also be checked in [gitk])
### Formal Requirements

* <http://wiki.eclipse.org/Development_Resources/Contributing_via_Git> 🡒 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
Expand Down

0 comments on commit df4a6c5

Please sign in to comment.