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

Complete Standard Process (Follow Exactly for Zero Conflicts)

1. Finish Locally (Most Important to Avoid PR Conflicts)

Save all development changes and synchronize with the latest dev code before creating a pull request.

# 1. Save all your development code
git add .
git commit -m "feat: complete A feature development"

# 2. Switch to dev and pull the latest remote code (crucial to prevent conflicts)
git checkout dev
git pull origin dev

# 3. Switch back to your feature branch and merge the latest dev code
git checkout feature/A
git merge dev

Resolve any conflicts locally to ensure the PR is clean.

2. Push the Local Branch to Remote

git push origin feature/A

3. Create the PR on GitHub

Base (target branch): dev

Compare (source branch): feature/A

After selecting the correct base and compare branches, submit the pull request.