From 4d0a6d83bdcbaadc31c76e8600d83fc225aa5f88 Mon Sep 17 00:00:00 2001 From: Stefan Paquay Date: Fri, 6 Jan 2017 11:51:42 +0100 Subject: [PATCH] Merged Axel's suggestions and updated text --- doc/src/JPG/tutorial_reverse_pull_request6.png | Bin 0 -> 6393 bytes doc/src/tutorial_github.txt | 14 +++++++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 doc/src/JPG/tutorial_reverse_pull_request6.png diff --git a/doc/src/JPG/tutorial_reverse_pull_request6.png b/doc/src/JPG/tutorial_reverse_pull_request6.png new file mode 100644 index 0000000000000000000000000000000000000000..4647850bb4ad4ce794633bd70381a1003bbd450c GIT binary patch literal 6393 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 Ml-0??6RtP^2UMr0ApigX literal 0 HcmV?d00001 diff --git a/doc/src/tutorial_github.txt b/doc/src/tutorial_github.txt index 5a937552c2..070fcc0108 100644 --- a/doc/src/tutorial_github.txt +++ b/doc/src/tutorial_github.txt @@ -283,7 +283,19 @@ Axel's change back into our branch, and merge them: $ git add tutorial_github.txt $ git add JPG/tutorial_reverse_pull_request*.png $ git commit -m "Updated text and images on reverse pull requests" - $ git pull + $ git pull :pre + +In this case, the merge was painless because github could auto-merge: + +:c,image(JPG/tutorial_reverse_pull_request6.png) + +With Axel's changes merged in and some final text updates, our feature branch is +now perfect as far as we are concerned, so we are going to commit and push again: + + $ git add tutorial_github.txt + $ git add JPG/tutorial_reverse_pull_request6.png + $ git commit -m "Merged Axel's suggestions and updated text" + $ git push git@github.com:Pakketeretet2/lammps :pre :line