Probably helps if this is in git
Merge remote-tracking branch 'upstream/develop' into develop