snipt

Ctrl+h for KB shortcuts

Text only

git merge conflicts

1
grep -lr '<<<<<<<' . | xargs git checkout --theirs
×

Copy “git merge conflicts”

(Text is selected. +C to copy.)

×

Embed “git merge conflicts”

(Text is selected. +C to copy.)

https://snipt.net/embed/cca86c8c58527986414eefaa4ff6859e/
/raw/cca86c8c58527986414eefaa4ff6859e/
cca86c8c58527986414eefaa4ff6859e
text
Text only
1
2025-04-04T11:37:59
True
False
False
Dec 20, 2016 at 08:59 PM
/api/public/snipt/1/
git-merge-conflicts
<table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><a href="#L-1">1</a></pre></div></td><td class="code"><div class="highlight"><pre><span></span><span id="L-1"><a name="L-1"></a>grep -lr &#39;&lt;&lt;&lt;&lt;&lt;&lt;&lt;&#39; . | xargs git checkout --theirs </span></pre></div> </td></tr></table>
git
1
2
3
4
--- 
+++ 
@@ -0,0 +1 @@
+grep -lr '<<<<<<<' . | xargs git checkout --theirs