You need to rebase a feature branch you worked on weeks ago. Merge conflicts everywhere. But: There's hope. Use "git merge --squash"....