The project I'm working on has 2 main branches, develop and master. I had set up a pull request for my feature branch but by mistake forgot to choose develop as the base, and so the PR was for master as its default (going to change that).
The PR was actually merged into master as the assigned person either didn't realise or thought it was right. Then my branch was deleted and the PR closed.
A little while later I had realised the mistake that it went into the wrong branch. When I looked at the original PR I noticed a revert button. So after some reading and speaking to another person we did the revert which makes one new commit and a new PR undoing all the commits made by the original PR.
That was then merged in and everything was back to normal. As before the mistake merge.
I restored my original feature branch and made a new PR for develop as originally intended. However just out of curiosity I choose master to see what Github says. Github said that I could not compare or merge as master contains all the commits as my feature branch.
So my question is. When the time is right, how would I get my changes into master if i wanted to merge directly in next week or so?
Or, this is what I'm confused about more, when my feature goes into develop as intended, what is going to happen / how is it going to work when the time comes to merge develop into master?
Remember, master has all the commits of the feature branch followed straight after with a single commit from a temp branch which reversed all the previous merges changes.
