Skip to content
Snippets Groups Projects
Commit c9bea607 authored by sjplimp's avatar sjplimp Committed by GitHub
Browse files

Merge pull request #326 from Pakketeretet2/github-tutorial-update

Updated images of succesful merge.
parents 5cd856c9 20f8a8c2
No related branches found
No related tags found
No related merge requests found
doc/src/JPG/tutorial_merged.png

57.1 KiB | W: | H:

doc/src/JPG/tutorial_merged.png

25.3 KiB | W: | H:

doc/src/JPG/tutorial_merged.png
doc/src/JPG/tutorial_merged.png
doc/src/JPG/tutorial_merged.png
doc/src/JPG/tutorial_merged.png
  • 2-up
  • Swipe
  • Onion skin
doc/src/JPG/tutorial_reverse_pull_request7.png

25.4 KiB

...@@ -336,12 +336,15 @@ commit and push again: ...@@ -336,12 +336,15 @@ commit and push again:
$ git commit -m "Merged Axel's suggestions and updated text" $ git commit -m "Merged Axel's suggestions and updated text"
$ git push git@github.com:Pakketeretet2/lammps :pre $ 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 :line
[After a merge] [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) :c,image(JPG/tutorial_merged.png)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment