diff options
| author | Dan Handley <dan.handley@arm.com> | 2014-03-28 10:49:39 +0000 |
|---|---|---|
| committer | Dan Handley <dan.handley@arm.com> | 2014-04-01 11:22:43 +0100 |
| commit | 7b5bf5c6e1bb54490a8b6b31267541ced1064227 (patch) | |
| tree | 19b40fa9d7d5d0bd9a4e3e22be85c4cf42de2b73 /contributing.md | |
| parent | 2eb01d341ff14c003d381cde97fbccdab4737afd (diff) | |
Update contributing.md with new integration process
Contributions will now be merged into an ARM Trusted Firmware
integration branch on GitHub instead of via an ARM internal
branch.
Diffstat (limited to 'contributing.md')
| -rw-r--r-- | contributing.md | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/contributing.md b/contributing.md index c054318..6b24fb5 100644 --- a/contributing.md +++ b/contributing.md @@ -78,16 +78,24 @@ Submitting Changes * Ensure we have your signed CLA. * Push your local changes to your fork of the repository. -* Submit a [pull request] to arm-trusted-firmware. - * The changes in the pull request will then undergo further review and +* Submit a [pull request] to the [arm-trusted-firmware] `integration` branch. + * The changes in the [pull request] will then undergo further review and testing. Any review comments will be made as comments on the [pull request]. This may require you to do some rework. * When the changes are accepted, ARM will integrate them. - * To ensure a linear commit history, ARM will typically rebase the commits - locally before merging to the [arm-trusted-firmware] `master` branch. In - this case, the [pull request] will be closed rather than directly merged - on GitHub. If the rebase is not trivial, you may be asked to rebase the - commits yourself. + * Typically, ARM will merge the [pull request] into the `integration` + branch within the GitHub UI, creating a merge commit. + * Please avoid creating merge commits in the [pull request] itself. + * If the [pull request] is not based on a recent commit, ARM may rebase + it onto the `master` branch first, or ask you to do this. + * If the [pull request] cannot be automatically merged, ARM will ask you + to rebase it onto the `master` branch. + * After final integration testing, ARM will push your merge commit to the + `master` branch. If a problem is found at this stage, the merge commit + will be removed from the `integration` branch and ARM will ask you to + create a new pull request to resolve the problem. + * Please do not delete your topic branch until it is safely merged into + the `master` branch. - - - - - - - - - - - - - - - - - - - - - - - - - - |