We are having a develop branch, and many different feature-branches. Now we have an extern developer, who created a feature-branch, and made an pull request to our repository (https://github.com/massiveart-webservices/ZOOLU/pull/7).
Now I have the problem that every change made in our develop-branch since the extern developer created his feature-branch gets deleted, if I try to merge his branch. You can see this on the pull request, e.g. on the file library/massiveart/generic/fields/Imagemap/data/helpers/Imagemap.php.
As far as I know git merges all the commits from the other branch into the desired one. So I thought that these files should not be deleted, as they are not deleted in any commit of the extern developer (in his repository these files even don’t exist). So my question is why git tries to delete this files, and how to resolve this issue.
I have also told him to pull the changes from our developer branch into his feature-branch, but the result was not satisfying…
The specific file you mention goes missing because of a mis-merge in commit 75326832600d0034138ec7bc15000d4cfcd50d3d. A correct merge would have added the file (since a merged version is supposed to be a superset of all changes in the merged branches), but this one didn’t, which is equivalent to a deletion of the file on the branch.