From ce13923d34a620b97137dfce18536394d528aecb Mon Sep 17 00:00:00 2001
From: Josh Sherman <joshsherman@gmail.com>
Date: Wed, 26 Jun 2024 11:25:46 -0500
Subject: [PATCH] Add a new git merge alias

---
 zsh/.aliases | 1 +
 1 file changed, 1 insertion(+)

diff --git a/zsh/.aliases b/zsh/.aliases
index b97b356..86ec3d1 100644
--- a/zsh/.aliases
+++ b/zsh/.aliases
@@ -80,6 +80,7 @@ alias gl='git pull origin $(git_current_branch)'
 alias glg='git log'
 alias gm='git merge'
 alias gmm='git merge $(git_default_branch)'
+alias gmt='git merge --strategy-option=theirs'
 alias gmv='git mv'
 alias gp='git push origin $(git_current_branch)'
 alias gpf='git push origin $(git_current_branch) --force'