Skip to content

Commit

Permalink
Improve comments
Browse files Browse the repository at this point in the history
  • Loading branch information
ernestognw committed Jun 14, 2023
1 parent a5cd5c0 commit cfcfb83
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions scripts/release/workflow/prepare-release-merge.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ git merge origin/master -m "Merge master to $GITHUB_REF_NAME" -X theirs || true

# When files were modified in the release branch but removed in master, git will not finish the merge
# and will leave the files in the index. We need to remove them manually.
# --diff-filter=U - Only unmerged files
git diff --name-only --diff-filter=U | xargs git rm

# Remove the originally deleted changesets to correctly sync with master
Expand Down

0 comments on commit cfcfb83

Please sign in to comment.