TrustedUser
574
edits
Difference between revisions of "Developer Central"
Jump to navigation
Jump to search
→Getting started: Make it clear to external submitters, Github Pull Request Commits should comply with Commit Guidelines.
(→Getting started: Update for Git/Github workflow.) |
(→Getting started: Make it clear to external submitters, Github Pull Request Commits should comply with Commit Guidelines.) |
||
| Line 12: | Line 12: | ||
* If you have write (push) access to our repository, you are expected to have read and to comply with our [[Commit Guidelines]].<br>Also, please read the tips for using Git here: [[Git tips]].<br>In particular, note the use of feature branches, when working on refactoring or other large connected changes, rather than committing directly to scummvm/master. | * If you have write (push) access to our repository, you are expected to have read and to comply with our [[Commit Guidelines]].<br>Also, please read the tips for using Git here: [[Git tips]].<br>In particular, note the use of feature branches, when working on refactoring or other large connected changes, rather than committing directly to scummvm/master. | ||
* If you do not have write (push) access to our repository, you should submit your contributions by one of the following methods: | * If you do not have write (push) access to our repository, you should submit your contributions by one of the following methods: | ||
** Using a [https://help.github.com/articles/using-pull-requests Github Pull Request].<br> This requires you to have/register a github account, fork our repository, commit your changes to a branch and then issue a Pull Request.<br>This is the current preferred method as it is easier for the team to review, discuss and amend prior to merging. | ** Using a [https://help.github.com/articles/using-pull-requests Github Pull Request].<br> This requires you to have/register a github account, fork our repository, commit your changes to a branch and then issue a Pull Request.<br>This is the current preferred method as it is easier for the team to review, discuss and amend prior to merging.<br>You are expected to have read and to comply with our [[Commit Guidelines]]. | ||
** Using the [http://sourceforge.net/tracker/?group_id=37116&atid=418822 patch tracker].<br>This requires you to have/register a sourceforge.net account, and generate a [https://en.wikipedia.org/wiki/Patch_%28Unix%29 patch] file, but this may be easier for developers unfamilar with Git or for small single commit changes, where a Pull Request might be considered overkill. | ** Using the [http://sourceforge.net/tracker/?group_id=37116&atid=418822 patch tracker].<br>This requires you to have/register a sourceforge.net account, and generate a [https://en.wikipedia.org/wiki/Patch_%28Unix%29 patch] file, but this may be easier for developers unfamilar with Git or for small single commit changes, where a Pull Request might be considered overkill. | ||
** If neither of the above methods are suitable, individual developers may be willing to accept patches or amended source files by other methods i.e. e-mail, but please ask in the project IRC channel or by e-mail before doing this. | ** If neither of the above methods are suitable, individual developers may be willing to accept patches or amended source files by other methods i.e. e-mail, but please ask in the project IRC channel or by e-mail before doing this. | ||