From 0b548255057ab425c9688fb095c7465e0b696399 Mon Sep 17 00:00:00 2001
From: Dhaya <154633+dhayab@users.noreply.github.com>
Date: Tue, 21 Jun 2022 16:26:01 +0200
Subject: [PATCH] fix(ci): fetch remote changes before pushing ref and tag with
 shipjs

---
 ship.config.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ship.config.js b/ship.config.js
index aa36e36ae8..7c5831b14b 100644
--- a/ship.config.js
+++ b/ship.config.js
@@ -57,6 +57,10 @@ module.exports = {
   pullRequestTeamReviewers: ['frontend-experiences-web'],
   buildCommand: ({ version }) =>
     `NODE_ENV=production VERSION=${version} yarn build`,
+  // Make sure the local branch is in sync with remote
+  // before pushing the ref and the tag on it
+  afterPublish: ({ exec }) =>
+    exec('git fetch && git rebase origin/master master'),
   slack: {
     // disable slack notification for `prepared` lifecycle.
     // Ship.js will send slack message only for `releaseSuccess`.