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 0000000000..4647850bb4 Binary files /dev/null and b/doc/src/JPG/tutorial_reverse_pull_request6.png differ 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