Please commit your changes or stash them before you merge
By Matt Cummings at Nov 16 2020
error: Your local changes to '.gitignore' would be overwritten by merge. Aborting. Please, commit your changes or stash them before you can merge.
By Marcos Wiegand at Dec 26 2020