To maintain consistency and ensure a smooth workflow in this repository, please follow these rules:
-
No direct pushes to the
mainbranch.- The
mainbranch is protected. Changes must be submitted via Pull Requests (PRs) and approved before merging.
- The
-
Work on tasks in separate branches.
- Each task or feature should be implemented in a new branch based on the
devbranch. - Use the proper naming convention for branches (see below).
- Each task or feature should be implemented in a new branch based on the
-
Branch Naming Convention:
- Use the following prefixes for branch names:
feat-...– for new features.bugfix-...– for fixing bugs.hotfix-...– for urgent fixes.refactor-...– for code refactoring.test-...– for changes to or creation of tests.docs-...– for updates to documentation.
- Use the following prefixes for branch names:
-
Pull Requests:
- All changes must be submitted as Pull Requests to
devormain. - PRs should have descriptive titles and include a summary of changes.
- PRs require at least one approval before merging.
- Resolving all code review comments is mandatory.
- All changes must be submitted as Pull Requests to
-
*Commit Messages: *Optional
- Commit messages should be clear and concise. Use prefixes like:
feat: ...fix: ...docs: ...refactor: ...
- Commit messages should be clear and concise. Use prefixes like:
-
Start the Task:
- Ensure you are on the
devbranch:git checkout dev
- Create a new branch:
git checkout -b feat-your-feature-name
- Ensure you are on the
-
Implement the Task:
- Write the code for your task.
- Regularly commit your changes:
git add . git commit -m "feat: added new feature"
-
Push and Create a Pull Request:
- Push your branch to the remote repository:
git push origin feat-your-feature-name
- Open a Pull Request to the
devbranch. - Add a detailed description of your changes.
- Push your branch to the remote repository:
-
Code Review:
- Wait for your code to be reviewed and approved.
- If changes are requested, make them in the same branch and push the updates:
git add . git commit -m "fix: addressed review comments" git push
-
Merge:
- Once the Pull Request is approved, it can be merged into the
devbranch.
- Once the Pull Request is approved, it can be merged into the
- Follow coding standards: Ensure your code adheres to the established style and conventions.
- Respect the structure: Do not modify the project structure without prior discussion.
By following these guidelines, we can maintain a clean codebase and streamline collaboration. If you have any questions, feel free to contact the repository administrator.