I merged a feature branch to master on local before pull request for it was merged to master, on local I have commit hash as hash1, after the pull request is approved and merged, will origin/master will be on different commit hash other than hash1 ? If they are different then when I take a pull from master into local feature branch and call origin’s hash as hash2, my branch should be like :
—hash1 – hash2
And now let say there is need to merge my local master to origin’s master, how git will be able to identify that the extra commit hash1 is same as hash2 ? Will hash1 appear after the master sync ? Will it affect the files in any way? If yes then how to avoid it? How will the scenario differ if I pull from feature instead of merging it locally on the first step that created hash2 ?