I joined a project in which the master branch has not been touched for a while. The development happened on another branch without occasional merging. Now I would like to establish back the idea of having a master branch for stable code and the develop branch for ongoing work.
I therefore merged the develop branch and resolved conflicts, but noticed that a difference between the branches remained. Around 40 files exist in the develop branch that have not been taken into consideration by git merge. The explanation found in Differences between 2 branches after merge: GIT seems legit, but now my question:
How to resolve the difference and bring the missing files from the develop branch into the master branch?