[git-gateway] master branch not updated with remote content when local override deleted

[themightychris]

When local overrides are deleted after a git history has already been initialized, the local branch gets updated to show the delete, but the merge into master shows the delete too. The gateway needs to check when applying a delete to a non-bottom layer whether that content exists at a lower level, and pull that forward when updating the composite branch