You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
To develop a feature or a fix, create a branch from your master (make sure your master is in sync with the scikit-hep master):
19
+
To develop a feature or a fix, create a branch from your main (make sure your main is in sync with the scikit-hep main):
20
20
```
21
-
git checkout -b my_cool_feature master
21
+
git checkout -b my_cool_feature main
22
22
```
23
-
Commit to your branch and initiate a pull request from the Github web page when you feel the feature is ready to be reviewed. Note: Never commit to the master, only to feature branches.
23
+
Commit to your branch and initiate a pull request from the Github web page when you feel the feature is ready to be reviewed. Note: Never commit to the main, only to feature branches.
24
24
25
-
The scikit-hep master may have moved forward in the meantime. Keep your local master branch in sync with these commands:
25
+
The scikit-hep main may have moved forward in the meantime. Keep your local main branch in sync with these commands:
26
26
```
27
-
git checkout master
28
-
git pull upstream master
27
+
git checkout main
28
+
git pull upstream main
29
29
git submodule update # update the nested sub-repositories if necessary
30
30
```
31
-
If you have followed the rule to never commit to the master, then these commands always work. Rebase your feature branch onto the updated master:
31
+
If you have followed the rule to never commit to the main, then these commands always work. Rebase your feature branch onto the updated main:
32
32
```
33
33
git checkout my_cool_feature
34
-
git rebase master
34
+
git rebase main
35
35
```
36
-
If conflicts between your changes and those in the master appear, you need to resolve them. Follow the instructions printed by git.
36
+
If conflicts between your changes and those in the main appear, you need to resolve them. Follow the instructions printed by git.
0 commit comments