Stash before merge
Track all files by modifying .gitignore
modify .gitignore