keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Just added linebreaks

Browse source
This commit is contained in:
Silke Meyer 2015-04-17 16:04:10 +02:00
parent 99cc1419f6
commit e6d516a355
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
doc/Github.md
View file

@ -8,21 +8,28 @@ Friendica on Github
1. Install git on the system you will be developing on. 1. Install git on the system you will be developing on.
2. Create your own [github](https://github.com) account. 2. Create your own [github](https://github.com) account.
3. Fork the Friendica repository from [https://github.com/friendica/friendica.git](https://github.com/friendica/friendica.git). 3. Fork the Friendica repository from [https://github.com/friendica/friendica.git](https://github.com/friendica/friendica.git).
4. Clone your fork from your Github account to your machine. Follow the instructions provided here: [http://help.github.com/fork-a-repo/](http://help.github.com/fork-a-repo/) to create and use your own tracking fork on github 4. Clone your fork from your Github account to your machine.
5. Commit your changes to your fork. Then go to your github page and create a "Pull request" to notify us to merge your work. Follow the instructions provided here: [http://help.github.com/fork-a-repo/](http://help.github.com/fork-a-repo/) to create and use your own tracking fork on github
5. Commit your changes to your fork.
Then go to your github page and create a "Pull request" to notify us to merge your work.
**Branches** **Branches**
There are two branches in the main repo on Github: There are two branches in the main repo on Github:
1. master: This branch contains stable releases only. 1. master: This branch contains stable releases only.
2. develop: This branch contains the latest code. This is what you want to work with. 2. develop: This branch contains the latest code.
This is what you want to work with.
**Important** **Important**
Please pull in any changes from the project repository and merge them with your work **before** issuing a pull request. We reserve the right to reject any patch which results in a large number of merge conflicts. This is especially true in the case of language translations - where we may not be able to understand the subtle differences between conflicting versions. Please pull in any changes from the project repository and merge them with your work **before** issuing a pull request.
We reserve the right to reject any patch which results in a large number of merge conflicts.
This is especially true in the case of language translations - where we may not be able to understand the subtle differences between conflicting versions.
Also - **test your changes**. Don't assume that a simple fix won't break something else. If possible get an experienced Friendica developer to review the code. Also - **test your changes**.
Don't assume that a simple fix won't break something else.
If possible get an experienced Friendica developer to review the code.
Check out how to work with [our Vagrant](help/Vagrant) to save a lot of setup time! Check out how to work with [our Vagrant](help/Vagrant) to save a lot of setup time!