Line 249: |
Line 249: |
| If the remote is not already a part of this git repo: | | If the remote is not already a part of this git repo: |
| #Add other project as a branch and fetch (-f). | | #Add other project as a branch and fetch (-f). |
− | #:<code>git remote add -f libStatGen_remote https://github.com/statgen/libStatGen.git</code> | + | #:<pre>git remote add -f libStatGen_remote https://github.com/statgen/libStatGen.git</pre> |
| #Create & checkout a branch for the remote. | | #Create & checkout a branch for the remote. |
| #* taking <code>master</code>: | | #* taking <code>master</code>: |
− | #: <code>git checkout -b libStatGen_branch libStatGen_remote/master</code> | + | #: <pre>git checkout -b libStatGen_branch libStatGen_remote/master</pre> |
| #* taking a tag: | | #* taking a tag: |
− | #: <code>git checkout -b vt_branch_SWS tags/SWS</code> | + | #: <pre>git checkout -b vt_branch_SWS tags/SWS</pre> |
| | | |
| If the remote is already a part of this git repo: | | If the remote is already a part of this git repo: |
| #Checkout the branch | | #Checkout the branch |
− | #: <code>git checkout libStatGen_branch</code> | + | #: <pre>git checkout libStatGen_branch</pre> |
| #Bring in the new version | | #Bring in the new version |
− | #: <code>git pull</code> | + | #: <pre>git pull</pre> |
| | | |
| === Merge the changes from the subtree into the base repository === | | === Merge the changes from the subtree into the base repository === |
| #Go back to the master branch | | #Go back to the master branch |
− | #: <code>git checkout master</code> | + | #: <pre>git checkout master</pre> |
| #(Optional) Only if adding a new subdirectory, do: | | #(Optional) Only if adding a new subdirectory, do: |
− | #: <code>git read-tree --prefix=src/libStatGen -u libStatGen_branch</code> | + | #: <pre>git read-tree --prefix=src/libStatGen -u libStatGen_branch</pre> |
| #Merge in the new version. | | #Merge in the new version. |
− | #: <code>git merge --squash -s subtree --no-commit libStatGen_branch</code> | + | #: <pre>git merge --squash -s subtree --no-commit libStatGen_branch</pre> |
| #:* --squash: do not merge histories | | #:* --squash: do not merge histories |
| #:* -s subtree: merge strategy | | #:* -s subtree: merge strategy |
| #:*--no-commit: just merge, don’t commit the changes | | #:*--no-commit: just merge, don’t commit the changes |
| #Commit the changes | | #Commit the changes |
− | #: <code>git commit -m “message”</code> | + | #: <pre>git commit -m “message”</pre> |