You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2015/07/10 14:46:48 UTC
[12/12] isis git commit: ISIS-1052: further docs on github-pr.sh
ISIS-1052: further docs on github-pr.sh
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/ee1a876b
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/ee1a876b
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/ee1a876b
Branch: refs/heads/master
Commit: ee1a876b44b2872ed28c1fb7772fe1a059bea206
Parents: caca051
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Fri Jul 10 13:46:10 2015 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Jul 10 13:46:10 2015 +0100
----------------------------------------------------------------------
.../_cg_committers_merging-a-pull-request.adoc | 10 +++++++++-
.../guides/images/committers/github-pr-history.png | Bin 0 -> 20047 bytes
2 files changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/ee1a876b/adocs/documentation/src/main/asciidoc/guides/_cg_committers_merging-a-pull-request.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_cg_committers_merging-a-pull-request.adoc b/adocs/documentation/src/main/asciidoc/guides/_cg_committers_merging-a-pull-request.adoc
index 1db36a4..6521aa1 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_cg_committers_merging-a-pull-request.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_cg_committers_merging-a-pull-request.adoc
@@ -97,6 +97,14 @@ If build successful and happy to merge, execute:
git checkout master && git merge --no-ff ISIS-1162_pr-31 && git branch -d ISIS-1162_pr-31
----
-When the merged branch is pushed, github will automatically close the original pull request.
+The screenshot belows shows the history we end up with:
+
+image::{_imagesdir}committers/github-pr-history.png[link="{_imagesdir}committers/github-pr-history.png"]
+
+This shows the fork being merged into the temporary branch ("ISIS-1162_pr-31"), then some further tidy-up, and finally the merging of the temporary branch into mainline.
+
+Note that there is no rebasing in this model. This is intentional: when the merged branch is pushed, github will automatically close the original pull request.
+
+
http://git-wip-us.apache.org/repos/asf/isis/blob/ee1a876b/adocs/documentation/src/main/asciidoc/guides/images/committers/github-pr-history.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/images/committers/github-pr-history.png b/adocs/documentation/src/main/asciidoc/guides/images/committers/github-pr-history.png
new file mode 100644
index 0000000..00e1f08
Binary files /dev/null and b/adocs/documentation/src/main/asciidoc/guides/images/committers/github-pr-history.png differ