Developer1: Pushed changes to acceptance
Developer1: Pushed changes
Developer2: Added file for my own changes
Developer2: Successfully pulled with rebase
Developer2: successfully merged the acceptance branch from origin into
local
Developer1: New file, trying to push