{"id":5499,"date":"2019-08-09T16:53:23","date_gmt":"2019-08-09T21:53:23","guid":{"rendered":"https:\/\/www.rushworth.us\/lisa\/?p=5499"},"modified":"2019-08-11T22:43:07","modified_gmt":"2019-08-12T03:43:07","slug":"git-listing-conflicting-files","status":"publish","type":"post","link":"https:\/\/www.rushworth.us\/lisa\/?p=5499","title":{"rendered":"Git: Listing Conflicting Files"},"content":{"rendered":"<p>To list the unmerged files &#8212; where you&#8217;ve got merge conflicts to resolve:<\/p>\n<pre><code>git diff --name-only --diff-filter=U<\/code><\/pre>\n<p>Filters are:<\/p>\n<ul>\n<li>Added (A)<\/li>\n<li>Copied (C)<\/li>\n<li>Deleted (D)<\/li>\n<li>Modified (M)<\/li>\n<li>Renamed (R)<\/li>\n<li>Type changed (T)<\/li>\n<li>Unmerged (U)<\/li>\n<li>Unknown (X)<\/li>\n<li>pairing Broken (B)<\/li>\n<\/ul>\n<p>(use lower case letters to exclude)<\/p>\n","protected":false},"excerpt":{"rendered":"<p>To list the unmerged files &#8212; where you&#8217;ve got merge conflicts to resolve: git diff &#8211;name-only &#8211;diff-filter=U Filters are: Added (A) Copied (C) Deleted (D) Modified (M) Renamed (R) Type changed (T) Unmerged (U) Unknown (X) pairing Broken (B) (use lower case letters to exclude)<\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[33],"tags":[233],"class_list":["post-5499","post","type-post","status-publish","format-standard","hentry","category-coding","tag-git"],"_links":{"self":[{"href":"https:\/\/www.rushworth.us\/lisa\/index.php?rest_route=\/wp\/v2\/posts\/5499","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/www.rushworth.us\/lisa\/index.php?rest_route=\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/www.rushworth.us\/lisa\/index.php?rest_route=\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/www.rushworth.us\/lisa\/index.php?rest_route=\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/www.rushworth.us\/lisa\/index.php?rest_route=%2Fwp%2Fv2%2Fcomments&post=5499"}],"version-history":[{"count":1,"href":"https:\/\/www.rushworth.us\/lisa\/index.php?rest_route=\/wp\/v2\/posts\/5499\/revisions"}],"predecessor-version":[{"id":5500,"href":"https:\/\/www.rushworth.us\/lisa\/index.php?rest_route=\/wp\/v2\/posts\/5499\/revisions\/5500"}],"wp:attachment":[{"href":"https:\/\/www.rushworth.us\/lisa\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=5499"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/www.rushworth.us\/lisa\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=5499"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/www.rushworth.us\/lisa\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=5499"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}