1. Check the current status of the git repository using `git status`.
2. Stage the necessary changes using `git add .` or `git add <file>`.
3. Commit the changes using `git commit -m "<type>: <description>"`, following the Conventional Commits format.
4. If creating a new feature, create a new branch using `git checkout -b feature/<feature-name>`.
5. After completing the feature, merge the branch back into the main branch using `git checkout main && git merge feature/<feature-name>`.
6. Resolve any merge conflicts that arise during the merge process.
7. Push the changes to the remote repository using `git push origin <branch-name>`.
SynapticSkills