/[sudobot]/trunk/docs/app/(docs)/developers/vcs-guide/page.mdx
ViewVC logotype

Diff of /trunk/docs/app/(docs)/developers/vcs-guide/page.mdx

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 631 by rakinar2, Sat Sep 7 09:42:28 2024 UTC revision 632 by rakinar2, Thu Oct 10 17:53:11 2024 UTC
# Line 147  Our superset defines the following addit Line 147  Our superset defines the following addit
147          ```git-commit          ```git-commit
148          deps(dev): update dev dependencies          deps(dev): update dev dependencies
149          ```          ```
150        3. **`merge`**: If you perform a merge, use this commit type. When using the
151            `git merge` command, you can pass the `-m` option and a commit message as
152            an argument. Sometimes git can choose to not perform a merge commit and instead
153            perform a "fast-forward" merge. In that case, there will be no additional commit,
154            and therefore the message will be ignored. In other cases when Git creates a new commit,
155            the commit message will be used.<br />
156            Example:<br />
157    
158            ```bash
159            git merge feature/new-permission-system -m "merge: feature/new-permission-system branch to main"
160            ```
161        4. **`i18n`**: This commit type is used when you add translations or make changes
162            that affect the internationalization of the bot.
163    
164  In addition to the rules described in the original Conventional Commits  In addition to the rules described in the original Conventional Commits
165  specification, we also have the following rules:  specification, we also have the following rules:
# Line 206  specification, we also have the followin Line 219  specification, we also have the followin
219    
220  We follow the an extended version of the  We follow the an extended version of the
221  [GitHub Flow](https://guides.github.com/introduction/flow/) workflow.  [GitHub Flow](https://guides.github.com/introduction/flow/) workflow.
222  Thee only main branch is `main` &mdash; this is the branch that is always  The only main branch is `main` &mdash; this is the branch that is always
223  deployed to production. Notable development works are done in feature branches,  deployed to production. Notable development works are done in feature branches,
224  which are then merged into the `main` branch via pull requests.  which are then merged into the `main` branch via pull requests.
225  If the feature or fix you're working on is small, you can commit directly to the  If the feature or fix you're working on is small, you can commit directly to the
# Line 227  We also have the following additional br Line 240  We also have the following additional br
240  2. **Bugfix Branches**: We create bugfix branches for working on a notable bug  2. **Bugfix Branches**: We create bugfix branches for working on a notable bug
241     fix or security patch. These branches are created from the `main` branch and     fix or security patch. These branches are created from the `main` branch and
242     are merged back into the `main` branch via pull requests.     are merged back into the `main` branch via pull requests.
243     These branches are prefixed by `fix/`.     These branches are prefixed by `bugfix/`.
244    
245  3. **Feature Branches**: We create feature branches for working on new features.  3. **Feature Branches**: We create feature branches for working on new features.
246     These branches are created from the `main` branch and are merged back into     These branches are created from the `main` branch and are merged back into
247     the `main` branch via pull requests.     the `main` branch via pull requests.
248     These branches are prefixed by `feat/`.     These branches are prefixed by `feature/`.
249    
250  ## Automation of Releases and Changelog Generation  ## Automation of Releases and Changelog Generation
251    
Legend:
Removed from v.631  
changed lines
  Added in v.632
[email protected]
 ViewVC Help
Powered by ViewVC 1.1.26