Pull request from feature branch into test branch shows changes that are already inside test branch

67 Views Asked by At

Using azure devops, I was merging a feature branch into test with some new changes.

I am not yet fluent in git, so my process is always via VS Code git options for merging, pulling and pushing and when I have new changes in feature branches that can go into test branch, I always create a pull request via azure devops.

However, in my current situation, in pull request there are changes listed for files that already exist in destination (test) branch. For example, FileA was merged from feature branch into test branch 2 weeks ago. I now made some changes to FileB and in the pull request, it shows that the FileA will also be merged into test branch, even though it already exists in test branch. I am not the sole developer and there were several commits into test already, but I can't pinpoint the exact problem neither in my commits, nor in others. As I said before, FileA was merged into test 2 weeks ago and now it shows up in pull request again, even though FileA was not deleted in any commit inbetween and I can still see FileA in test branch when I open up the source files on azure devops.

What could've happened here and what can I do?

0

There are 0 best solutions below