diff --git a/doc/src/JPG/tutorial_merged.png b/doc/src/JPG/tutorial_merged.png index d3961afae7..069c007350 100644 Binary files a/doc/src/JPG/tutorial_merged.png and b/doc/src/JPG/tutorial_merged.png differ diff --git a/doc/src/JPG/tutorial_reverse_pull_request7.png b/doc/src/JPG/tutorial_reverse_pull_request7.png new file mode 100644 index 0000000000..89ea823636 Binary files /dev/null and b/doc/src/JPG/tutorial_reverse_pull_request7.png differ diff --git a/doc/src/tutorial_github.txt b/doc/src/tutorial_github.txt index aed47a5733..d6ec22589b 100644 --- a/doc/src/tutorial_github.txt +++ b/doc/src/tutorial_github.txt @@ -336,12 +336,15 @@ commit and push again: $ git commit -m "Merged Axel's suggestions and updated text" $ git push git@github.com:Pakketeretet2/lammps :pre +This merge also shows up on the lammps Github page: + +:c,image(JPG/tutorial_reverse_pull_request7.png) :line [After a merge] -When everything is fine, the feature branch is merged into the master branch. +When everything is fine, the feature branch is merged into the master branch: :c,image(JPG/tutorial_merged.png)