If the base branch for your repository is not the default
master, you might have encountered this bizarre Pull Request problem when you try to deploy from base branch onto
You merged from base branch
master with a Pull Request. Then when you want to merge some other change from
master, somehow the old changes are still there!
The problems lies in the way we merge. There are 3 options (if you can’t find them in the dropdown, go to
Settings -> Options -> Merge button and enable them):
Due to the nature of
rebase, only the first option will actually preserve both the file changes and the exact same git commits, thereby putting
master on the same line, in the same status, after a merge.
Use the normal merge,
Create a merge commit to merge base branch
dev into deploy branch