Is there a way to have git show you the file(s) that prevent a pull due to conflict, ideally as a list? My Duck-fu has failed me. Command-line methods are preferred but not required for this.
(I know about rebasing. I’m not looking for workarounds, I’m asking if there’s a way to get a list of conflicted files.)
Eric A. Meyer /
npub1dg…ayw0u
2024-07-09 12:55:29
Author Public Key
npub1dgewglf93wmf9u26ppwmmjmqa5uphv5jrtmtfkc3q7n754z3p8xqyayw0uPublished at
2024-07-09 12:55:29Event JSON
{
"id": "bb23fc030e653f61eb4dcdca68459bdc997ec2c1dd216a1dc32f67835e90a293",
"pubkey": "6a32e47d258bb692f15a085dbdcb60ed381bb2921af6b4db1107a7ea545109cc",
"created_at": 1720529729,
"kind": 1,
"tags": [
[
"proxy",
"https://mastodon.social/users/Meyerweb/statuses/112756636370006299",
"activitypub"
]
],
"content": "Is there a way to have git show you the file(s) that prevent a pull due to conflict, ideally as a list? My Duck-fu has failed me. Command-line methods are preferred but not required for this.\n\n(I know about rebasing. I’m not looking for workarounds, I’m asking if there’s a way to get a list of conflicted files.)",
"sig": "9322f7b89ad89d20f760b424e6db27e7dc7d436c45aec4e4bc03e49e018c7917e57d35c41a9c2297ffeb33f4acc25668c63c4bb61525477b11dd0adde16c095c"
}