Each developer works in the master branch, editing files and making commits locally

When a convenient breakpoint is reached, the developer will synchronize their work with the remote

You won't be able to push to remote
if it has changed since your last pull

STEP 1

Pull latest changes from the remote
and rebase

STEP 2

Locally merge the remote changes,
resolving any conflicts
 

STEP 3

Push merge commit and your other
local commits to the remote