BeeEngine/vulkan-headers
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

improve upstream merge strategy

Browse source 
Signed-off-by: Stephen Gutekanst <stephen@hexops.com>
This commit is contained in:
Stephen Gutekanst 2023-06-24 18:28:11 -07:00
parent b4a5468dcf
commit dfac3e461d
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
update.sh
View file

@ -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