git showUntrackedAll and remember conflicts resolution