Git can recognize the files I modified, but the GitHub user interface shows other changes

[infradmin-citify]

Select Topic Area

Question

Body

Hello,
Something strange has been happening to me for a week now: Git can recognize the files I have modified, but the GitHub user interface shows changes that have already been merged into the dev branch as if I were introducing them into my pull request.

Thank you, I look forward to your comments.

[JulianCeleita]

This usually happens when your feature branch was created from an outdated version of dev, or if dev was updated (via a squash merge or rebase) after you started your work. GitHub’s UI shows the 'diff' between the common ancestor of both branches and your current head.

If those changes are already in dev but appearing in your PR, it means your branch doesn't 'know' they are already there. Here is how to fix it:

1. Update your local environment
   First, ensure your local dev is perfectly synced with the remote:

git checkout dev
git pull origin dev

2. Sync your feature branch
   Go back to your PR branch and bring in the latest changes from dev. You have two options:

Option A: Merge (Safest)

git checkout your-feature-branch
git merge dev

This will create a merge commit, but it should clear the 'already merged' changes from the GitHub UI.

Option B: Rebase (Cleaner history)

git checkout your-feature-branch
git rebase dev

This rewrites your commits on top of the current dev. Note: You will need to git push --force after this.

If your team uses Squash and Merge, the commit IDs change when they land in dev. Even if the code is the same, Git sees different hashes and thinks they are 'new' changes you are trying to introduce. Syncing your branch as shown above forces Git to realize those changes are already part of the target branch's history.

[tawhidurnoor]

Run these commands on your feature branch to sync with latest dev

git checkout your-feature-branch
git fetch origin
git rebase origin/dev
git push origin your-feature-branch --force-with-lease

This rebases your branch onto latest dev and force pushes. PR will update to show only your changes.