From 36bf3324454ac8c3cf19346bbe6a0ce23ff1d71b Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Wed, 24 Nov 2021 13:36:09 +0000 Subject: [PATCH] update beats: fix new file location (#6700) (cherry picked from commit ea46964f7d21debffefbe81761e51dc3167d5f25) # Conflicts: # .ci/scripts/update-beats.sh --- .ci/scripts/update-beats.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.ci/scripts/update-beats.sh b/.ci/scripts/update-beats.sh index 326781570e..9576bdf1c9 100755 --- a/.ci/scripts/update-beats.sh +++ b/.ci/scripts/update-beats.sh @@ -9,9 +9,15 @@ make update-beats COMMIT_MESSAGE="Update to elastic/beats@$(go list -m -f {{.Version}} github.com/elastic/beats/... | cut -d- -f3)" git checkout -b "update-beats-$(date "+%Y%m%d%H%M%S")" +<<<<<<< HEAD git add go.mod go.sum NOTICE.txt \ .go-version docs/version.asciidoc \ docs/fields.asciidoc include/fields.go x-pack/apm-server/include/fields.go +======= +git add --ignore-errors go.mod go.sum NOTICE.txt \ + .go-version docs/version.asciidoc + +>>>>>>> ea46964f (update beats: fix new file location (#6700)) find . -maxdepth 2 -name Dockerfile -exec git add {} \; git diff --staged --quiet || git commit -m "$COMMIT_MESSAGE"