Most answers to this question sugest running git stash -u but my .gitignore file has most files in directory ignored, and the branches I\'m trying to merge are
git stash -u
