Archive for the ‘GIT’ Category

List GIT Failed Automatic Merge Files Only

Thursday, March 29th, 2012

If you just did a merge in GIT and had some automatic merge failures, you can use git status -s to see all updates with unmerged errors marked as U or you can run the following command and just show those files that failed on merge.

git diff --name-status --diff-filter=U

©2005-2017 Blog – Epiphany Digital is proudly powered by Badgers and Web Design is by Epiphany Digital
Entries (RSS) and Comments (RSS). 36 queries. 8.135 seconds.

Thank you for visiting this site. The web fairy will visit you in your sleep... you know, I was going somewhere with this, but it really doesn't have as much innocent charm as the tooth fairy, especially when I picture the web fairy as someone much like the Simpsons' Comic Book Guy but with wings. It's just not something I want.