You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ja...@apache.org on 2019/05/21 13:39:10 UTC
[cordova-coho] branch janpio-docs_cleanup created (now 9070746)
This is an automated email from the ASF dual-hosted git repository.
janpio pushed a change to branch janpio-docs_cleanup
in repository https://gitbox.apache.org/repos/asf/cordova-coho.git.
at 9070746 remove outdated PR instructions
This branch includes the following new commits:
new 9070746 remove outdated PR instructions
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[cordova-coho] 01/01: remove outdated PR instructions
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
janpio pushed a commit to branch janpio-docs_cleanup
in repository https://gitbox.apache.org/repos/asf/cordova-coho.git
commit 9070746be8af72c16e4a148d49e02ecbf232ea4f
Author: Jan Piotrowski <pi...@gmail.com>
AuthorDate: Tue May 21 15:39:05 2019 +0200
remove outdated PR instructions
---
docs/processing-pull-requests.md | 133 ---------------------------------------
1 file changed, 133 deletions(-)
diff --git a/docs/processing-pull-requests.md b/docs/processing-pull-requests.md
deleted file mode 100644
index 31703d4..0000000
--- a/docs/processing-pull-requests.md
+++ /dev/null
@@ -1,133 +0,0 @@
-<!--
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
--->
-
-# Processing Pull Requests
-
-For a visual walkthrough, see slides from ApacheCon 2015 talk on [Committer Tools](http://goo.gl/ciGnaR).
-
-## Prerequisites:
- * Ensure you are familiar with [committer-workflow.md](committer-workflow.md)
-
-## Step 0:
-Find what requests need attention by looking at the GitHub page.
-
-To look at them in aggregate:
-
- coho list-pulls | tee pulls.list | less -R
-
-Alternatively, you can navigate to http://s.apache.org/cordovaPulls to see all PRs for Cordova repos.
-
-To filter out those that you last commented on:
-
- coho list-pulls --hide-user=agrieve
-
-To show only certain repos:
-
- coho list-pulls -r js -r android -r plugin-inappbrowser
-
-### Stale Pull Requests
-
-To close a pull request that is no longer relevant / active:
-
- * Create an empty commit in the repo of the pull request via:
- * `git commit --allow-empty -m "Closing stale pull request: close #99"
-
-## Step 1: Review the change
- * Ensure that we actually want the change (if unsure, bring it up on the ML)
- * If there is no JIRA issue for the change, create one
- * Ensure the JIRA issue has a link to the pull request
- * Ensure the pull request has a link to the JIRA issue
- * View the PR and user's branch in GitHub and request changes be made (if applicable) by adding comments in the web interface
-
-## Step 2: Ensure they have signed the Contributor Agreement
- * For trivial changes, this is not necessary (e.g. use your judgement - e.g. less than 100 lines of code)
- * Find their name on: http://home.apache.org/unlistedclas.html
- * If it is not there, respond with:
-
-_Thanks for the pull request. I've had a look at it and think it looks good. Before we can merge it though, you need to sign Apache's Contributor License Agreement (can be done online): http://www.apache.org/licenses/#clas_
-
-## Step 3: Testing
- * You are responsible for testing the changes that push.
- * Refer to [committer-workflow.md](committer-workflow.md) for how to test each repo.
- * If it would be appropriate to write a test
- * Either write one yourself, or ask the author to do so.
- * If you write one yourself, commit it in a follow-up (don't squash it with theirs)
-
-## Step 4: Merge the change
-
-There are two ways to merge a PR.
-
-The goal is to have one or more commits in `master` that are connected to both the original author and you as the commiter, and include the JIRA issue number in the form CB-#### (no "[]"'s, no ":").
-
-Example commit message:
-
- CB-6124 Make `cordova plugin remove` resilient to a missing plugin directory
-
- This breaks a couple prepare tests that Andrew deletes in the next commit.
-
- github: close #57
-
-### Step 4a: Merge using GitHub UI
-GitHub offers a simple way to [merge PRs using its UI](https://help.github.com/articles/merging-a-pull-request/#merging-a-pull-request-on-github). "Squash and merge" will squash all commits together, "Merge pull request" create one merge request of the changes. Both will let you set or edit the commit message. If the original author already did a great job with commits and its commit messages, you also can "Rebase and merge" the PR directly onto `master`.
-
-### Step 4b: Merge using `coho`
-Run the following as an exemplary way to merge to master:
-
- coho merge-pr --pr <pr#>
-
-This command will do the following:
-* Update your local master.
-* Fetch the PR and create a branch named `pr/pr#`
-* Attempt a `--ff-only` merge to master. If this fails, then:
- * Perform a rebase of the `pr/pr#` branch.
- * Attempt a `--ff-only` merge to master.
- * On success, it will modify the last commit's message to include. 'This closes #pr' to ensure the corresponding PR closes on pushing to remote.
-
-You then should:
- * Squash as many commits as is reasonable together.
- * In the final commit message (if there are multiple), [tell GitHub to close the pull request](https://help.github.com/articles/closing-issues-via-commit-messages)
-
-#### Step 4b1: Check the author
-Git keeps track of the author of commits separately from the committer of the commit.
-
-Typically, both of these values are set to the person submitting the pull request.
-After your pull/merge/rebase/whatever work, you may find the values have changed - or not.
-What we would typically be looking for is the final commit to have YOU as the committer and the original author as the author.
-
-You can check these fields with the following command:
-
- git log --pretty=full
-
-If the author is set to YOU, and you'd like to reset it to the original author, you can amend the commit:
-
- git commit --amend --author=some_author_id_here
-
-#### Step 4b2: Push the change
-
- git push
-
-## Step 5: Update JIRA
- * Same as you would as if you authored the change.
-
-## Step 6: Final details
- * The commit will get attached to the pull request automatically from the "closes #" in the commit message.
- * If you haven't done so already, thank them for their contribution via a pull request comment :).
-
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org