I created a feature branch from develop branch. I was working on the feature branch for some weeks and to keep my branch in sync with Develop branch changes, I did the Merged Develop branch into my feature branch.
Now - in other feature branch Pull Request merge to Develop few files were deleted from develop. I merged develop into my local which removed those files from my branch also. But the same files were added back to develop branch in some other PR merge.
Now the issue is even when I merge develop branch(with the files added back), the files are not appearing in my feature branch and when I create a Pull Request, I can see those specific files as files changed(deletion) and if I merge the pull request that would delete the files from develop branch which I don't want.
Has anyone faced this issue and what was the resolution?