From ProventusNova DeveloperWiki
Git workflow
This section shows the standard Git workflow when merging feature branches into the develop
branch. These steps ensure a clean commit history, reduce merge conflicts, and promote a collaborative development process.
Steps for merging branches into develop
1. Checkout the develop branch:
git checkout develop
2. Pull the latest changes:
git pull
3. Checkout the feature branch:
git checkout -b feature/branch-name
4. Rebase the feature branch onto develop:
git rebase develop
5. Switch back to develop:
git checkout develop
6. Merge the feature branch (no fast-forward):
git merge --no-ff feature/branch-name
Need Further Support?
📞 Book Consultation Call: Show Calendar!
📩 Contact Via Email: support@proventusnova.com
🌐 Visit Our Website: ProventusNova.com