This is an automated email from the ASF dual-hosted git repository.
rabbah pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk.wiki.git
The following commit(s) were added to refs/heads/master by this push:
new 87af73e Updated Contributing: Git guidelines (markdown)
87af73e is described below
commit 87af73e75543d91fc92ed9a2f7cd22fe6926754f
Author: rodric rabbah <rod...@gmail.com>
AuthorDate: Fri Mar 2 13:32:45 2018 -0500
Updated Contributing: Git guidelines (markdown)
---
Contributing:-Git-guidelines.md | 12 ++----------
1 file changed, 2 insertions(+), 10 deletions(-)
diff --git a/Contributing:-Git-guidelines.md b/Contributing:-Git-guidelines.md
index 3d54ad7..bfb82c5 100644
--- a/Contributing:-Git-guidelines.md
+++ b/Contributing:-Git-guidelines.md
@@ -72,16 +72,12 @@ The instructions assume that the merger has set up a git
remote with the name `u
2. Checkout your fork:
- ```
git clone g...@github.com:yourname/incubator-openwhisk
- ```
3. Add upstream remote:
- ```
git remote add upstream g...@github.com:apache/incubator-openwhisk
git fetch --all
- ```
After this setup, your local `master`, should point to the same commit as
`origin/master` and `upstream/master`. You can confirm that by running, e.g.,
`git log -1 --decorate` (FWIW, for log inspection, I personally recommend using
[`tig`](https://github.com/jonas/tig)).
@@ -239,25 +235,21 @@ Merging pull requests is primarily a mechanical process.
Before merging, confirm
2. GitHub conveniently sets up a reference for pull requests. This means
that contrary to what some parts of the Internet will have you believe, you
don't need to add a new remote for every different developer who submits a pull
request. Assuming you want to merge in pull request number 18, do the following:
- ```
PR=18
git fetch upstream pull/$PR/head:"pr-$PR"
- ```
- This will checkout all the commits in the pull request into a local branch
called `pr-18` (that name is arbitrary).
+This will checkout all the commits in the pull request into a local branch
called `pr-18` (that name is arbitrary).
3. Since you're still in `master`, you can try `git merge --ff-only
"pr-$PR"`. If this works, you're done and all you have to do is `git push
upstream master`. GitHub automatically closes the pull request for you as it
detects that all commits have been merged in.
4. If the pull request was not constructed on top of `upstream/master` or if
it had since diverged, 3. above will fail with `Not possible to fast-forward,
aborting.`. You should rebase the branch:
- ```
git checkout "pr-$PR"
git rebase master
# (fix conflicts, or ask requester to rebase themselves and update the
pull request if too complex)
git checkout master
git merge --ff-only "pr-$PR"
git push upstream master
- ```
- Now the pull request has been merged. GitHub may not have closed it
automatically, though, as the commits have new hashes. You can close it
manually and make a note that the commits are in master, with different hashes.
+Now the pull request has been merged. GitHub may not have closed it
automatically, though, as the commits have new hashes. You can close it
manually and make a note that the commits are in master, with different hashes.
--
To stop receiving notification emails like this one, please contact
rab...@apache.org.
