From a7957fb840926370122c621b7cf12b9e9a7c1c86 Mon Sep 17 00:00:00 2001
From: Alex Scerba <alex@scerba.org>
Date: Tue, 29 Oct 2024 14:24:27 -0400
Subject: Add link for resolving merge conflicts with binary files git

---
 static/links.html | 1 +
 1 file changed, 1 insertion(+)

(limited to 'static/links.html')

diff --git a/static/links.html b/static/links.html
index 4c461f6..e44b026 100644
--- a/static/links.html
+++ b/static/links.html
@@ -259,6 +259,7 @@
             <li><a href="https://stackoverflow.com/questions/17577409/git-remove-merge-commit-from-history">Remove merge commit from history</a></li>
             <li><a href="https://git-rebase.io">git-rebase.io</a> - intro to git rebase</li>
             <li><a href="https://jvns.ca/blog/2024/02/01/dealing-with-diverged-git-branches/">Dealing with diverged git branches</a> - remote to local</li>
+            <li><a href="https://stackoverflow.com/questions/278081/resolving-a-git-conflict-with-binary-files">Resolve a git conflict with binary files</a></li>
         </ul>
         <h3>Go</h3>
         <ul>
-- 
cgit v1.2.3