... | ... | @@ -33,18 +33,57 @@ Create a personal fork of Trilinos on GitHub. Go to [the Trilinos repository pag |
|
|
</p>
|
|
|
</details>
|
|
|
|
|
|
<details><summary>4. Branch ...</summary>
|
|
|
<details><summary>4. Create and checkout a branch to make changes on</summary>
|
|
|
|
|
|
<p>
|
|
|
|
|
|
under construction
|
|
|
* git checkout develop
|
|
|
* git branch <my_branch_name>
|
|
|
* git checkout <my_branch_name>
|
|
|
|
|
|
</p>
|
|
|
</details>
|
|
|
|
|
|
<summary>5. Make, commit, and test changes to new branch</summary>
|
|
|
|
|
|
<details><summary>6. Bring in the most recent changes from develop</summary>
|
|
|
|
|
|
<p>
|
|
|
|
|
|
* git fetch
|
|
|
* git checkout <my_branch_name>
|
|
|
|
|
|
At this point, changes can either be merged in from the develop branch, or changes made to <my_branch_name> can be rebased against the current version of develop using one of the following commands. There are [pros and cons](https://www.atlassian.com/git/tutorials/merging-vs-rebasing) to rebasing or merging. Very briefly, rebasing maintains a nicer history, while merging is safe to do in all cases.
|
|
|
|
|
|
* git merge upstream/develop
|
|
|
|
|
|
or
|
|
|
|
|
|
* git rebase upstream/develop
|
|
|
|
|
|
</p>
|
|
|
</details>
|
|
|
|
|
|
<summary>7. Test with most recent changes from develop</summary>
|
|
|
|
|
|
<details><summary>8. Push branch to GitHub fork</summary>
|
|
|
|
|
|
<p>
|
|
|
* git checkout <my_branch_name>
|
|
|
* git push origin <my_branch_name>
|
|
|
</p>
|
|
|
</details>
|
|
|
|
|
|
<details><summary>5. ...</summary>
|
|
|
<details><summary>9. Create pull request on GitHub</summary>
|
|
|
|
|
|
<p>
|
|
|
...
|
|
|
</p>
|
|
|
</details>
|
|
|
|
|
|
<details><summary>10. Delete branch after the pull request has been merged</summary>
|
|
|
|
|
|
<p>
|
|
|
* git push --delete origin branchname
|
|
|
</p>
|
|
|
</details> |
|
|
\ No newline at end of file |
|
|
</details> |