liandk

Jun 4, 2026 · Fundamentals

How to Merge a Feature Branch PR into the dev Branch Without Conflicts

This guide walks through a zero‑conflict workflow for merging a feature branch into the dev branch, covering local finalization, pulling the latest dev, merging locally, pushing the feature branch, and creating a GitHub pull request with the correct base and compare settings.