I suppose I could copy the code in master, edit the file in develop, paste the code, then make a new commit, overwriting the other developer's changes...