File tree Expand file tree Collapse file tree 2 files changed +11
-3
lines changed Expand file tree Collapse file tree 2 files changed +11
-3
lines changed Original file line number Diff line number Diff line change @@ -111,9 +111,6 @@ async function run() {
111
111
console . log ( '%s duplicates found' , filteredDuplicates . length )
112
112
if ( filteredDuplicates . length > 0 ) {
113
113
console . log ( formatDuplicates ( filteredDuplicates , commitHash , repoName ) )
114
- console . log (
115
- '* Hint: if these duplicates appear unrelated to the changes, rebase onto the latest target branch.'
116
- )
117
114
process . exit ( 1 )
118
115
}
119
116
}
Original file line number Diff line number Diff line change 84
84
git remote add forkUpstream https://github.com/$REPO_NAME # URL of the fork
85
85
git fetch forkUpstream # Fetch fork
86
86
87
+ - name : Merge in target branch to avoid false negatives.
88
+ env :
89
+ TARGET_BRANCH : ${{ github.event.pull_request.base.ref }}
90
+ # Note: "git merge" should always succeed here, because GHA won't
91
+ # start the job if there are merge conflicts. https://github.com/orgs/community/discussions/11265
92
+ # Also, because `git merge` makes a commit, we need to establish an identity to avoid 'Committer identity unknown' error
93
+ run : |
94
+ git config --global user.name "aws-toolkit-automation"
95
+ git config --global user.email "<>"
96
+ git merge origin/$TARGET_BRANCH
97
+
87
98
- name : Compute git diff
88
99
env :
89
100
CURRENT_BRANCH : ${{ github.head_ref }}
You can’t perform that action at this time.
0 commit comments