YunoHost/moulinette
1
0
Fork 0
mirror of https://github.com/YunoHost/moulinette.git synced 2024-09-03 20:06:31 +02:00
Code Issues Projects Releases Packages Wiki Activity

Update CONTRIBUTE.md

Browse source
This commit is contained in:
Alexis Gavoty 2012-10-21 15:56:44 +03:00
parent d35d29d12b
commit 74fa5a9697
1 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
CONTRIBUTE.md
View file

@ -59,23 +59,29 @@ git rebase origin/dev
``` ```
Do your modifications, then : Do your modifications, then :
`` git commit -am 'My commit message' `` ```
`` git pull origin dev `` (merge manually if conflicts) git commit -am 'My commit message'
`` git push origin dev_beudbeud `` git pull origin dev (merge manually if conflicts)
git push origin dev_beudbeud
```
Then you could ask for a 'merge request' in gitlab. Then you could ask for a 'merge request' in gitlab.
**For github (here):** **For github (here):**
Development is handle with forked repos and you have your own (i.e beudbeud/moulinette). Development is handle with forked repos and you have your own (i.e beudbeud/moulinette).
`` git clone https://github.com/beudbeud/moulinette.git `` ```
`` git checkout -b dev `` git clone https://github.com/beudbeud/moulinette.git ``
`` git rebase origin/dev `` git checkout -b dev
git rebase origin/dev
```
Do your modifications, then: Do your modifications, then:
`` git commit -am 'My commit message' `` ```
`` git remote add vanilla https://github.com/YunoHost/moulinette.git `` git commit -am 'My commit message'
`` git pull vanilla dev `` (merge manually if conflicts) git remote add vanilla https://github.com/YunoHost/moulinette.git
`` git push origin dev `` git pull vanilla dev (merge manually if conflicts)
git push origin dev
```
Then you could ask for a 'pull request' in github. Then you could ask for a 'pull request' in github.