Skip to content

Commit 46e835e

Browse files
authored
chore: clarify the contributing process (#30)
1 parent b2e4059 commit 46e835e

File tree

2 files changed

+97
-0
lines changed

2 files changed

+97
-0
lines changed

.github/workflows/qa.yaml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,20 @@ name: QA
22

33
on:
44
push:
5+
paths-ignore:
6+
- '.github/workflows/publish.yml'
7+
- '.github/workflows/publish-dev.yml'
8+
- '.github/ISSUE_TEMPLATE/*'
9+
- '*.md'
510
branches:
611
- main
712
- develop
813
pull_request:
14+
paths-ignore:
15+
- '.github/workflows/publish.yml'
16+
- '.github/workflows/publish-dev.yml'
17+
- '.github/ISSUE_TEMPLATE/*'
18+
- '*.md'
919
branches:
1020
- main
1121
- develop

contributing.md

Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
1+
# Contributing
2+
3+
We highly appreciate your contributions to the project ❤️
4+
5+
## Main flow
6+
7+
### Step 1 — get code
8+
9+
```shell
10+
git clone git@github.com:ton-org/create-ton.git
11+
cd create-ton
12+
git checkout -b name-of-your-feature origin/develop
13+
```
14+
15+
### Step 2 — write code
16+
17+
Write the code for your change, test it locally, then commit
18+
19+
> Git history: work log vs recipe https://www.bitsnbites.eu/git-history-work-log-vs-recipe/
20+
Use [Conventional Commits](https://www.conventionalcommits.org/)
21+
22+
```shell
23+
git commit --message "feat: paypal payment for different users"
24+
```
25+
26+
or
27+
28+
```shell
29+
git commit --message "fix: hide password display when searching for a user"
30+
```
31+
32+
### Step 3 — make a fork
33+
34+
Go [here](https://github.com/ton-org/create-ton/fork) to make a fork, then setup your remote:
35+
36+
```bash
37+
git remote add self url_of_your_fork
38+
```
39+
40+
### Step 4 — make a pull request
41+
42+
Push:
43+
44+
```shell
45+
git push --set-upstream self name-of-your-feature
46+
```
47+
48+
Then create a pull request from the [pull requests page](https://github.com/ton-org/create-ton/pulls) or directly:
49+
50+
```shell
51+
https://github.com/ton-org/create-ton/pull/new/name-of-your-feature
52+
```
53+
(note the name of your branch in the URL)
54+
55+
### Step 5 — update your branch from main
56+
57+
This step may be necessary in case the `main`/`develop` branch has changed since you created your branch
58+
59+
> [!NOTE]
60+
> A tidy, linear Git history https://www.bitsnbites.eu/a-tidy-linear-git-history/
61+
62+
Get the latest upstream changes and update the working branch:
63+
64+
```shell
65+
git fetch --prune origin
66+
git rebase --autostash --ignore-date origin/main
67+
```
68+
> [!WARNING]
69+
> Please note that you get the current state of the `main` branch from the **origin** remote for pushing to your own branch
70+
71+
During the rebase, there may be conflicts, they need to be resolved; once the conflicts are resolved, you can continue the rebase:
72+
73+
```shell
74+
git rebase --continue
75+
```
76+
77+
Upload the updated working branch to the repository; given that we changed the history, this should be done with the force option:
78+
79+
```shell
80+
git push --force --set-upstream self name-of-your-feature
81+
```
82+
83+
More details can be found in the tutorial: [git rebase](https://www.atlassian.com/git/tutorials/rewriting-history/git-rebase)
84+
85+
## All set 🎉
86+
87+
Thanks for your time and code!

0 commit comments

Comments
 (0)