My colleague and I are working on the same repository. We've branched it into two branches, each technica
How do I force an overwrite of local files on a git pull? The scenario is the following: A team member is mo