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
- Create a new branch to start working. (e.g. fix)
72
69
73
-
```
70
+
```bash
74
71
git checkout -b fix
75
72
```
76
73
77
74
You can make code changes after creation.
78
75
79
-
- Push the changes to a remote repository：(e.g. fix)
76
+
- Push the changes to a remote repository. (e.g. fix)
80
77
81
-
```
78
+
```bash
82
79
git commit -a -m "<you_commit_message>"
83
80
git push origin fix
84
81
```
@@ -91,67 +88,67 @@ When submitting code on git, you should pay attention to:
91
88
92
89
- Keep the repository clean:
93
90
94
-
- Do not submit binary files, so that the size of the repository only increases due to changes in the code.
91
+
- Do not submit binary files, so that the size of the repository only increases due to changes in the code.
95
92
96
-
- Do not submit generated code.
93
+
- Do not submit generated code.
97
94
98
95
- The log should have meaning:
99
96
100
-
- Title is jira numbered: [IOTDB-jira number]
97
+
- Title is jira numbered: `[IOTDB-jira number]`
101
98
102
-
- Title is the issue number of GitHub: [ISSUE-issue number]
99
+
- Title is the issue number of GitHub: `[ISSUE-issue number]`
103
100
104
-
- Write #XXXX in the content for association.
101
+
- Write #XXXX in the content for association.
105
102
106
103
### Create PR
107
104
108
-
Goto your github page, find the apache/servicecomb-website project, swich to the branch you just pushed, click on `New pull request` and then `Create pull request`, see the image below:If you solve the [issues](https://issues.apache.org/jira/projects/IOTDB/issues), you need to add [IOTDB-xxx] at the beginning，see the image below:
105
+
Goto your github page, find the apache/servicecomb-website project, switch to the branch you just pushed, click on `New pull request` and then `Create pull request`, see the image below:If you solve the [issues](https://issues.apache.org/jira/projects/IOTDB/issues), you need to add `[IOTDB-xxx]` at the beginning，see the image below:
Congrautulations, now you have succesfully submitted a PR. For more on PR, please read [collaborating-with-issues-and-pull-requests](https://help.github.com/categories/collaborating-with-issues-and-pull-requests/)
109
+
Congratulations, now you have successfully submitted a PR. For more on PR, please read [collaborating-with-issues-and-pull-requests](https://help.github.com/categories/collaborating-with-issues-and-pull-requests/)
113
110
114
111
### Resolve conflicts
115
112
116
113
When a same piece of file is edited by multiple person simultaneously, conflicts can occur. It can be resolved as follow:
117
114
118
-
1：Switch to the master branch
115
+
1.Switch to the master branch
119
116
120
-
```
121
-
git checkout master
122
-
```
117
+
```bash
118
+
git checkout master
119
+
```
123
120
124
-
2：Pull the upstream’s master branch
121
+
2.Pull the upstream’s master branch
125
122
126
-
```
127
-
git pull upstream master
128
-
```
123
+
```bash
124
+
git pull upstream master
125
+
```
129
126
130
-
3：Switch back to the branch we are working on(e.g. fix)
127
+
3.Switch back to the branch we are working on(e.g. fix)
131
128
132
-
```
133
-
git checkout fix
134
-
```
129
+
```bash
130
+
git checkout fix
131
+
```
135
132
136
-
4：Rebase the working branch onto the master branch
133
+
4.Rebase the working branch onto the master branch
137
134
138
-
```
139
-
git rebase -i master
140
-
```
135
+
```bash
136
+
git rebase -i master
137
+
```
141
138
142
-
A list of commits will be listed on your text editor. Normally we can just save and exit. Git will now apply the commits one by one onto the master branch until it encounters a conflict. When this happens, the rebase process is paused. We need to resolve the conflicts, then execute
139
+
A list of commits will be listed on your text editor. Normally we can just save and exit. Git will now apply the commits one by one onto the master branch until it encounters a conflict. When this happens, the rebase process is paused. We need to resolve the conflicts, then execute
143
140
144
-
```
145
-
git add .
146
-
git rebase --continue
147
-
```
141
+
```bash
142
+
git add .
143
+
git rebase --continue
144
+
```
148
145
149
-
Repeat this process until all commits are successfully applied. And finally run
146
+
Repeat this process until all commits are successfully applied. And finally run
150
147
151
-
5：to push the resolved branch to remote origin
148
+
5.to push the resolved branch to remote origin
152
149
153
-
```
154
-
git push -f origin fix
155
-
```
150
+
```bash
151
+
git push -f origin fix
152
+
```
156
153
157
154
The code of conduct is derived from[Apache ServiceComb](http://servicecomb.apache.org/developers/submit-codes/)
The mailing list is the only communication channel that Apache designates for open source contributors. So try to make discussions on the mailing list as much as possible. The mailing list is essentially a mailbox. After subscription, all emails sent to this mailbox will be forwarded to the subscribed mailbox. The subscription method is as follows:
2. Confirming subscription: You will receive a subscription confirmation email from iotdb.apache.org after completing the previous step. Confirm your subscription by sending another email to this email with any subject matter.
2. Confirming subscription: You will receive a subscription confirmation email from iotdb.apache.org after completing the previous step. Confirm your subscription by sending another email to this email with any subject matter.
28
27
29
28
## Create a development platform account
30
29
31
-
1. Creating Jira account: [https://issues.apache.org/jira/projects/IOTDB/issues](https://issues.apache.org/jira/projects/IOTDB/issues) in order to claim issues.
32
-
2. Creating Confluence account: [https://cwiki.apache.org/confluence/display/IOTDB/Home](https://cwiki.apache.org/confluence/display/IOTDB/Home) . It is then used to write design documents.
30
+
1. Creating Jira account: [https://issues.apache.org/jira/projects/IOTDB/issues](https://issues.apache.org/jira/projects/IOTDB/issues) in order to claim issues.
31
+
2. Creating Confluence account: [https://cwiki.apache.org/confluence/display/IOTDB/Home](https://cwiki.apache.org/confluence/display/IOTDB/Home) . It is then used to write design documents.
33
32
34
33
After creation, please send an email to the mailing list including **self introduction**, **Jira ID** and **Confluence ID**. The community PMC will add permissions to the account.
0 commit comments