Last active
October 15, 2018 02:35
-
-
Save nodejh/12540a81b633441b5448e0595baa041a to your computer and use it in GitHub Desktop.
获取git的冲突文件 https://stackoverflow.com/questions/3065650/whats-the-simplest-way-to-get-a-list-of-conflicted-files
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| ``` | |
| git diff --name-only --diff-filter=U | |
| ``` | |
| https://stackoverflow.com/questions/3065650/whats-the-simplest-way-to-get-a-list-of-conflicted-files |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment