Imagine a project that has a master branch called "master".
About 3 months ago, a developer branched off of master, making a new branch called "dev".
Now, 300 commits on "dev" later, with significant changes to the codebase and some removed and added files, I've been tasked with merging dev back into master. The problem that I'm running into is the volume of changes is way too much to do manual merge on. Ideally, what I'd like to do is something like git merge -s theirs dev
from master, where it does the merge automatically taking all the diff from dev.
Is there a way of doing this?