From f7285ed35bd6d6d7d785f27264012bc8f12e710b Mon Sep 17 00:00:00 2001
From: "Chris S. Kim" <ckim@hashicorp.com>
Date: Thu, 27 Jan 2022 10:59:05 -0500
Subject: [PATCH] ci: Update CI to stash changes before checkout (#12210)

---
 .circleci/config.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index aa5c02dd3..cb1b1a588 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -690,10 +690,15 @@ jobs:
               git config --local user.email "github-team-consul-core@hashicorp.com"
               git config --local user.name "hc-github-team-consul-core"
               
+              # stash newly built bindata_assetfs.go
+              git stash push
+              
               # checkout the CI branch and merge latest from main
               git checkout ci/main-assetfs-build
               git merge --no-edit main
             
+              git stash pop
+            
               short_sha=$(git rev-parse --short HEAD)
               git add agent/uiserver/bindata_assetfs.go
               git commit -m "auto-updated agent/uiserver/bindata_assetfs.go from commit ${short_sha}"