File tree Expand file tree Collapse file tree 1 file changed +3
-3
lines changed Expand file tree Collapse file tree 1 file changed +3
-3
lines changed Original file line number Diff line number Diff line change @@ -41,9 +41,9 @@ Direct contributions to pymatgen main distribution
41
41
pip install -e '.[dev,optional]'
42
42
43
43
6. Code (see `Coding Guidelines `_). Commit early and commit often. Keep your code up to date. You need to add the main
44
- repository to the list of your remotes. Let's name the upstream repo as mpmaster (materialsproject master)::
44
+ repository to the list of your remotes. Let's name the upstream repo as upstream (materialsproject master)::
45
45
46
- git remote add mpmaster git://github.com/materialsproject/pymatgen.git
46
+ git remote add upstream git://github.com/materialsproject/pymatgen.git
47
47
48
48
Make sure your repository is clean (no uncommitted changes) and is currently on the master branch. If not, commit or
49
49
stash any changes and switch to the master::
@@ -52,7 +52,7 @@ Direct contributions to pymatgen main distribution
52
52
53
53
Then you can pull all the new commits from the main line::
54
54
55
- git pull mpmaster master
55
+ git pull upstream master
56
56
57
57
Remember, pull is a combination of the commands fetch and merge, so there may be merge conflicts that may need to be
58
58
manually resolved.
You can’t perform that action at this time.
0 commit comments