https://developerwiki.proventusnova.com/index.php?action=history&feed=atom&title=Git_workflow
Git workflow - Revision history
2026-04-18T05:00:38Z
Revision history for this page on the wiki
MediaWiki 1.39.17
https://developerwiki.proventusnova.com/index.php?title=Git_workflow&diff=207&oldid=prev
Admin: Create git workflow page
2025-06-16T05:01:18Z
<p>Create git workflow page</p>
<p><b>New page</b></p><div>== Git workflow ==<br />
<br />
This section shows the standard Git workflow when merging feature branches into the <code>develop</code> branch. These steps ensure a clean commit history, reduce merge conflicts, and promote a collaborative development process.<br />
<br />
=== Steps for merging branches into develop ===<br />
<br />
1. Checkout the develop branch:<br />
<syntaxhighlight lang="bash"><br />
git checkout develop<br />
</syntaxhighlight><br />
2. Pull the latest changes:<br />
<syntaxhighlight lang="bash"><br />
git pull<br />
</syntaxhighlight><br />
3. Checkout the feature branch:<br />
<syntaxhighlight lang="bash"><br />
git checkout -b feature/branch-name<br />
</syntaxhighlight><br />
4. Rebase the feature branch onto develop:<br />
<syntaxhighlight lang="bash"><br />
git rebase develop<br />
</syntaxhighlight><br />
5. Switch back to develop:<br />
<syntaxhighlight lang="bash"><br />
git checkout develop<br />
</syntaxhighlight><br />
6. Merge the feature branch (no fast-forward):<br />
<syntaxhighlight lang="bash"><br />
git merge --no-ff feature/branch-name<br />
</syntaxhighlight><br />
<br />
{{Footer}}</div>
Admin