diff options
| author | Alex Scerba <alex@scerba.org> | 2024-10-29 14:24:27 -0400 |
|---|---|---|
| committer | Alex Scerba <alex@scerba.org> | 2024-10-29 14:24:27 -0400 |
| commit | a7957fb840926370122c621b7cf12b9e9a7c1c86 (patch) | |
| tree | 4002245acc58e3f288783885b5af0532e0834ac7 /static/links.html | |
| parent | e6c689faf7adb8f59ed25839d35dcff55390b7a7 (diff) | |
Add link for resolving merge conflicts with binary files git
Diffstat (limited to 'static/links.html')
| -rw-r--r-- | static/links.html | 1 |
1 files changed, 1 insertions, 0 deletions
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>
|