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
Copy file name to clipboardExpand all lines: docs/documentation/docs/guides/contributing.md
+12-11Lines changed: 12 additions & 11 deletions
Original file line number
Diff line number
Diff line change
@@ -27,22 +27,23 @@ Typos are embarrassing! Most PR's that fix typos will be accepted immediately. I
27
27
Before contributing:
28
28
29
29
- ensure that the **dev** branch on your fork is in sync with the original **sp-dev-fx-controls-react** repository
30
-
```bash
31
-
# assuming you are in the folder of your locally cloned fork....
32
-
git checkout dev
33
30
34
-
# assuming you have a remote named `upstream` pointing to the official **sp-dev-fx-controls-react** repo
35
-
git fetch upstream
31
+
```bash
32
+
# assuming you are in the folder of your locally cloned fork....
33
+
git checkout dev
36
34
37
-
# update your local dev to be a mirror of what's in the main repo
38
-
git pull --rebase upstream dev
39
-
```
35
+
# assuming you have a remote named `upstream` pointing to the official **sp-dev-fx-controls-react** repo
36
+
git fetch upstream
37
+
38
+
# update your local dev to be a mirror of what's in the main repo
39
+
git pull --rebase upstream dev
40
+
```
40
41
41
42
- create a feature branch for your change. If you'll get stuck on an issue or merging your PR will take a while, this will allow you to have a clean dev branch that you can use for contributing other changes
Copy file name to clipboardExpand all lines: docs/documentation/docs/guides/submitting-pr.md
+13-12Lines changed: 13 additions & 12 deletions
Original file line number
Diff line number
Diff line change
@@ -7,22 +7,23 @@ We appreciate your initiative and would love to integrate your work with the res
7
7
-[AC: Keep Your Forked Git Repo Updated with Changes from the Original Upstream Repo](http://www.andrewconnell.com/blog/keep-your-forked-git-repo-updated-with-changes-from-the-original-upstream-repo)
8
8
- Looking for a quick cheat sheet? Look no further:
9
9
10
-
```bash
11
-
# assuming you are in the folder of your locally cloned fork....
12
-
git checkout dev
10
+
```bash
11
+
# assuming you are in the folder of your locally cloned fork....
12
+
git checkout dev
13
13
14
-
# assuming you have a remote named `upstream` pointing to the official **sp-dev-fx-controls-react** repo
15
-
git fetch upstream
14
+
# assuming you have a remote named `upstream` pointing to the official **sp-dev-fx-controls-react** repo
15
+
git fetch upstream
16
16
17
-
# update your local dev branch to be a mirror of what's in the main repo
18
-
git pull --rebase upstream dev
17
+
# update your local dev branch to be a mirror of what's in the main repo
18
+
git pull --rebase upstream dev
19
19
20
-
# switch to your branch where you are working, say "issue-xyz"
21
-
git checkout issue-xyz
20
+
# switch to your branch where you are working, say "issue-xyz"
21
+
git checkout issue-xyz
22
+
23
+
# update your branch to update its fork point to the current tip of dev & put your changes on top of it
24
+
git rebase dev
25
+
```
22
26
23
-
# update your branch to update its fork point to the current tip of dev & put your changes on top of it
24
-
git rebase dev
25
-
```
26
27
- submit PR to the **dev** branch of the main repo. PRs submitted to other branches will be declined
27
28
- let us know what's in the PR: is it a new command, bug fix or a minor update in the docs? The clearer the information you provide, the quicker your PR can be verified and merged
28
29
- ideally 1 PR = 1 commit - this makes it easier to keep the log clear for everyone and track what's changed. If you're new to working with git, we'll squash your commits for you when merging your changes into the main repo
0 commit comments