Loading doc/src/JPG/tutorial_merged.png −31.7 KiB (25.3 KiB) Loading image diff... doc/src/JPG/tutorial_reverse_pull_request7.png 0 → 100644 +25.4 KiB Loading image diff... doc/src/tutorial_github.txt +4 −1 Original line number Diff line number Diff line Loading @@ -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) Loading Loading
doc/src/tutorial_github.txt +4 −1 Original line number Diff line number Diff line Loading @@ -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) Loading
