We have an outside contractor that does some work for us, but he was on vacation so I was working on the feature branch he'd been working on. Yesterday he pulled my committed changes but I hadn't committed my latest work. Last night he committed his changes, so when I got to work this morning and committed my changes there was a conflict because we'd worked on the same function in the same branch.