inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-10-01 14:41:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

[#5950] Fix branch name. (#5951)

Browse Source
This commit is contained in:
Yuuki Ebihara
2020-08-05 16:59:45 +09:00
committed by GitHub
parent 5f5bedd1fc
commit fcb6dc0059
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
CONTRIBUTING.md
View File

@@ -13,10 +13,10 @@ Before you submit a pull request please follow the steps below:
* Search in the [GitHub release history](https://github.com/Alfresco/alfresco-ng2-components/releases) to see if your * Search in the [GitHub release history](https://github.com/Alfresco/alfresco-ng2-components/releases) to see if your
issue has already been solved in a new version of ADF. issue has already been solved in a new version of ADF.
* Fork our repository (if you don't know how to do this, read [this GitHub document](https://help.github.com/articles/creating-a-pull-request-from-a-fork/)). * Fork our repository (if you don't know how to do this, read [this GitHub document](https://help.github.com/articles/creating-a-pull-request-from-a-fork/)).
* Make your changes in a new git branch starting from development and following our [naming convention](https://github.com/Alfresco/alfresco-ng2-components/wiki/Branching-Strategy) * Make your changes in a new git branch starting from develop and following our [naming convention](https://github.com/Alfresco/alfresco-ng2-components/wiki/Branching-Strategy)
```shell ```shell
git checkout -b dev-{developerName}-{GitIssuedId/JiraIssueId} development git checkout -b dev-{developerName}-{GitIssuedId/JiraIssueId} develop
``` ```
* Create your PR **including appropriate test cases** following the [code contribution acceptance criteria](https://github.com/Alfresco/alfresco-ng2-components/wiki/Code-contribution-acceptance-criteria) * Create your PR **including appropriate test cases** following the [code contribution acceptance criteria](https://github.com/Alfresco/alfresco-ng2-components/wiki/Code-contribution-acceptance-criteria)
@@ -28,16 +28,16 @@ Before you submit a pull request please follow the steps below:
git push origin dev-{developerName}-{GitIssuedId/JiraIssueId} git push origin dev-{developerName}-{GitIssuedId/JiraIssueId}
``` ```
* In GitHub, send a pull request to `development`. * In GitHub, send a pull request to `develop`.
* If we suggest changes then: * If we suggest changes then:
* Make the required updates. * Make the required updates.
* Re-run the tests. * Re-run the tests.
* Rebase your branch and force push to your GitHub repository (this will update your Pull Request): * Rebase your branch and force push to your GitHub repository (this will update your Pull Request):
```shell ```shell
git fetch development git fetch develop
git checkout dev-my-branch git checkout dev-my-branch
git rebase development -i git rebase develop -i
git push -f git push -f
``` ```
Note: If you need more information about how to sync your fork, see [this page](https://help.github.com/articles/syncing-a-fork/). Note: If you need more information about how to sync your fork, see [this page](https://help.github.com/articles/syncing-a-fork/).