@@ -10,8 +10,7 @@ This assumes you have already:
1010
1111Details on how to create forks can be found at https://help.github.com/articles/fork-a-repo.
1212
13- You now have a configuration like that shown at (but without the upstream/local connection).
14- https://stackoverflow.com/questions/6286571/are-git-forks-actually-git-clones.
13+ You now have a configuration like that shown at https://stackoverflow.com/a/6286877/6346040.
1514
1615Upstream, in this case, is the official Spack repository on GitHub. Origin is
1716your fork on GitHub, and Local Machine is your local clone (from your fork).
@@ -54,16 +53,17 @@ Fetch from the upstream repo::
5453To update your local machine, you may wish to rebase or overwrite your local files.
5554Select from the following:
5655
57- If you have local changes to go "on top" of latest code ::
56+ Now make your local machine identical to upstream repo (** WARNING: ** Any local changes will be lost!) ::
5857
59- git rebase upstream/develop
58+ git reset --hard upstream/develop
6059
61- Or to make your local machine identical to upstream repo (**WARNING: ** Any local changes will be lost!)::
60+ Alternativvely, if you have existing local changes to go "on top" of latest code (usually we will
61+ make our release updates after this)::
6262
63- git reset --hard upstream/develop
63+ git rebase upstream/develop
6464
6565(Optional) You may want to update your forked (origin) repo on GitHub at this point.
66- This may requires a forced push::
66+ This may require a forced push::
6767
6868 git push origin develop --force
6969
@@ -106,9 +106,9 @@ This will install a few python spack packages and run style checks on just
106106your changes. Make adjustments if needed, until this passes.
107107
108108If okay - add, commit, and push to origin (forked repo). For example, if your version
109- number is 0.9.1 ::
109+ number is 1.2.2 ::
110110
111- git commit -am "libEnsemble: add v0.9.1 "
111+ git commit -am "libEnsemble: add v1.2.2 "
112112 git push origin develop --force
113113
114114Once the branch is pushed to the forked repo, go to GitHub and do a pull request from this
0 commit comments