You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
For more details see [upmerge_pr.yaml](/Sylius/PayPalPlugin/blob/1.7/.github/workflows/upmerge_pr.yaml).
54
-
55
-
**Remember!** The upmerge should always be merged with using `Merge pull request` button.
56
-
57
-
In case of conflicts, please resolve them manually with usign the following commands:
58
-
```
59
-
git fetch upstream
60
-
gh pr checkout <this-pr-number>
61
-
git merge upstream/${{ matrix.target_branch }} -m "Resolve conflicts between ${{ matrix.base_branch }} and ${{ matrix.target_branch }}"
62
-
```
63
-
64
-
If you use other name for the upstream remote, please replace `upstream` with the name of your remote pointing to the `Sylius/PayPalPlugin` repository.
65
-
66
-
Once the conflicts are resolved, please run `git merge --continue` and push the changes to this PR.
0 commit comments