...
If the merge fails with an error "Refusing to merge unrelated histories", then use the following procedure to force a reset (this example is for release/stable-3.15):
| Code Block |
|---|
git fetch --all --prune
git reset --hard origin/release/stable-3.15 |
...