Sometimes you start working in a branch, and that branch basically becomes the master. I had a problem once where merging this branch didn’t go so well – and what was the point anyway? That branch had become my new master.
The solution is the ours merge strategy (not to be confused with the ours-conflict resolution option). Thanks StackOverflow