Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add how-to resolve auto-merge conflict [skip ci] #3965

Merged
merged 1 commit into from
Nov 1, 2021
Merged

Add how-to resolve auto-merge conflict [skip ci] #3965

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions .github/workflows/auto-merge/automerge
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,21 @@ def auto_merge(number, sha):
```
{r.json()}
```

Please use the following steps to fix the merge conflicts manually:
```
# Assume upstream is NVIDIA/spark-rapids remote
git fetch upstream {HEAD} {BASE}
git checkout -b fix-auto-merge-conflict-{number} upstream/{BASE}
git merge upstream/{HEAD}
# Fix any merge conflicts caused by this merge
git commit -am "Merge {HEAD} into {BASE}"
git push <personal fork> fix-auto-merge-conflict-{number}
# Open a PR targets NVIDIA/spark-rapids {BASE}
```
**IMPORTANT:** Before merging this PR, be sure to change the merging strategy to `Create a merge commit` (repo admin only).

Once this PR is merged, the auto-merge PR should automatically be closed since it contains the same commit hashes
""")
print(f'status code: {r.status_code}')
print(r.json())
Expand Down