-
-
Notifications
You must be signed in to change notification settings - Fork 253
/
Copy pathCONTRIBUTING.md
190 lines (147 loc) · 7.57 KB
/
CONTRIBUTING.md
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
# CONTRIBUTING
## AstroCommunity install for contributors
If you wish to contribute to AstroCommunity, you should:
1. [create a fork on GitHub](https://docs.github.com/en/get-started/quickstart/fork-a-repo)
2. clone your fork to your machine (lazy.nvim automatically uses the `~/project` folder for development of plugins, this can be configured in [lazy.nvim](https://github.com/folke/lazy.nvim#%EF%B8%8F-configuration))
- For ssh:
```shell
$ git clone [email protected]:<YOUR GITHUB USERNAME>/astrocommunity.git ~/projects/astrocommunity
```
- For https:
```shell
$ git clone https://github.com/<YOUR GITHUB USERNAME>/astrocommunity.git ~/projects/astrocommunity
```
3. [add a new remote repo to track](https://www.atlassian.com/git/tutorials/git-forks-and-upstreams)
- this means you can push/pull as normal to your own repo, but also easily track & update from the AstroCommunity repo
- for ssh:
```shell
$ git remote add upstream [email protected]:AstroNvim/astrocommunity.git
```
- for https:
```shell
$ git remote add upstream https://github.com/AstroNvim/astrocommunity.git
```
4. any time you create a branch to do some work, use
```shell
$ git fetch upstream && git checkout -b dev-myFEAT upstream/main
```
5. only use the **--rebase** flag to update your dev branch
- this means that there are no `Merge astrocommunity/main into devBranch` commits, which are to be avoided
```shell
$ git pull upstream --rebase
```
6. setup your AstroNvim to tell the Lazy package manager to use your local clone of AstroCommunity. This can be done a couple different ways (these are added to your `plugins` specification table):
- specifying the entire path that you cloned the repo to
```lua
{ dir = "/path/to/astrocommunity" },
```
- with the `dev` feature which by default looks in the `~/projects` folder:
```lua
{ "AstroNvim/astrocommunity", dev = true },
```
## Things to know before contributing
- When making a PR (pull request), please be very descriptive about what you've done!
- Pull request titles must follow [Conventional Commits Specification](https://www.conventionalcommits.org/en/v1.0.0/)
- We use an only squash and merge development cycle here, so please open PRs that make sense to be represented in the git history in a single commit message
- PR titles should be formatted with 'fix', 'feat', 'docs', 'refactor', or 'chore'. ex: `feat(<scope>): add new plugin`
- If your contribution contains any sort of breaking change include a `!` at the end of the change type. ex: `feat(<scope>)!: move status bar from lualine to feline`
- PR titles should include the given scope of the project that is modified. This should be the name of the pre-existing directory in the project before the PR. For example:
- If you are adding a new plugin, the scope would be the name of the category it is being added into. ex. `feat(utility): added noice.nvim plugin`
- If you are modifying a pre-existing plugin or pack, the scope would be the name of the plugin folder. ex. `fix(noice-nvim): fix LSP handler error`
- PRs should follow the pull request formats where applicable
- When adding a new plugin, we are trying our best to use categories as used by [NeovimCraft](https://neovimcraft.com/). Please check there to see if your plugin exists and use the category they use. If there the plugin isn't available use the best fit category and we can discuss the organization on the pull request.
## How to remove, squash, or edit commits from your PR
> You may have been directed here to remove a commit such as a merge commit: `Merge astrocommunity/main into devBranch` from your PR
> As these commands edit your git history, you may need to **force push** with `git push origin --force-with-lease`
1. Run the following:
```
$ git rebase -i HEAD~<NUMBER OF COMMITS TO GO BACK>
```
<details><summary>Example</summary>
<p>
```shell
$ git rebase -i HEAD~4
```
```shell
pick 28b2dcb feat: statusline add lsp status
pick dad9a39 fix: typo
pick 68f72f1 add clickable btn for exiting nvim
pick b281b53 avoid using q! for quitting vim
# Rebase 52b655b..b281b53 onto 52b655b (4 commands)
#
# Commands:
# p, pick <commit> = use commit
# r, reword <commit> = use commit, but edit the commit message
# e, edit <commit> = use commit, but stop for amending
# s, squash <commit> = use commit, but meld into previous commit
# f, fixup <commit> = like "squash", but discard this commit's log message
# x, exec <command> = run command (the rest of the line) using shell
# b, break = stop here (continue rebase later with 'git rebase --continue')
# d, drop <commit> = remove commit
# l, label <label> = label current HEAD with a name
# t, reset <label> = reset HEAD to a label
# m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]
# . create a merge commit using the original merge commit's
# . message (or the oneline, if no original merge commit was
# . specified). Use -c <commit> to reword the commit message.
#
# These lines can be re-ordered; they are executed from top to bottom.
#
# If you remove a line here THAT COMMIT WILL BE LOST.
#
# However, if you remove everything, the rebase will be aborted.
#
# Note that empty commits are commented out
```
</p>
</details>
2. Change the `pick` commands to whatever you wish, you may wish to `s` `squash`, `d` `drop` or `e` `edit` a commit. Then save & quit this git file to run it.
<details><summary>Example</summary>
<p>
```shell {3,4}
pick 28b2dcb feat: statusline add lsp status
squash dad9a39 fix: typo
edit 68f72f1 add clickable btn for exiting nvim
d b281b53 avoid using q! for quitting vim
# Rebase 52b655b..b281b53 onto 52b655b (4 commands)
#
# Commands:
# p, pick <commit> = use commit
# r, reword <commit> = use commit, but edit the commit message
# e, edit <commit> = use commit, but stop for amending
# s, squash <commit> = use commit, but meld into previous commit
# f, fixup <commit> = like "squash", but discard this commit's log message
# x, exec <command> = run command (the rest of the line) using shell
# b, break = stop here (continue rebase later with 'git rebase --continue')
# d, drop <commit> = remove commit
# l, label <label> = label current HEAD with a name
# t, reset <label> = reset HEAD to a label
# m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]
# . create a merge commit using the original merge commit's
# . message (or the oneline, if no original merge commit was
# . specified). Use -c <commit> to reword the commit message.
#
# These lines can be re-ordered; they are executed from top to bottom.
#
# If you remove a line here THAT COMMIT WILL BE LOST.
#
# However, if you remove everything, the rebase will be aborted.
#
# Note that empty commits are commented out
```
</p>
</details>
3. If you picked `drop` you are done. If you picked `squash` then you will be brought to a screen to update the commit message for the new aggregated commit, please make sure the new commit message follows the Conventional Commit specification. If you picked `edit` then edit your files, then run:
```shell
$ git add <files>
```
4. Continue rebasing until all edits are finished. Run the following command to continue through the rebase if there are more changes:
```shell
$ git rebase --continue
```
5. Push the changes with `--force-with-lease`:
```shell
$ git push origin --force-with-lease
```
## Help
For help with contributing and anything else AstroNvim related join the [discord](https://discord.gg/UcZutyeaFW)