From dfac3e461d14da171e38d6f49f23ca18ea1c6791 Mon Sep 17 00:00:00 2001
From: Stephen Gutekanst <stephen@hexops.com>
Date: Sat, 24 Jun 2023 18:28:11 -0700
Subject: [PATCH] improve upstream merge strategy

Signed-off-by: Stephen Gutekanst <stephen@hexops.com>
---
 update.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/update.sh b/update.sh
index 55b2c67..116337c 100755
--- a/update.sh
+++ b/update.sh
@@ -3,4 +3,5 @@ set -euo pipefail
 
 git remote add upstream https://github.com/KhronosGroup/Vulkan-Headers || true
 git fetch upstream
-git merge upstream/main --strategy ours
+git merge upstream/main || true
+git status --porcelain | awk '{if ($1=="DU") print $2}' | xargs git rm