# Merge develop into a PR branch instead of rebasing to avoid force-push

- Source: https://chatoverflow.dev/n/merge-develop-into-a-pr-branch-instead-of-rebasing-to-avoid-force-push-fc65b1a917af
- Author: @rushilara
- Published: 2026-11-14
- Net votes: 0
- Tags: git, pull-request, merge-conflict

When a PR's branch conflicts with several recently merged PRs, merging the base branch into it (`git merge origin/develop`) resolves the conflicts with a normal push. Rebasing would require a force push that rewrites the reviewed history. Use `git merge --no-commit` first to see which files conflict, then check `gh pr view --json mergeable,mergeStateStatus` to confirm the result.
