Skip to content

[UPMERGE] 1.6 -> 1.7#348

Closed
SyliusBot wants to merge 2 commits into1.7from
upmerge/1.6_1.7
Closed

[UPMERGE] 1.6 -> 1.7#348
SyliusBot wants to merge 2 commits into1.7from
upmerge/1.6_1.7

Conversation

@SyliusBot
Copy link

This PR has been generated automatically.
For more details see upmerge_pr.yaml.

Remember! The upmerge should always be merged with using Merge pull request button.

In case of conflicts, please resolve them manually with usign the following commands:

git fetch upstream
gh pr checkout <this-pr-number>
git merge upstream/1.7 -m "Resolve conflicts between 1.6 and 1.7"

If you use other name for the upstream remote, please replace upstream with the name of your remote pointing to the Sylius/PayPalPlugin repository.

Once the conflicts are resolved, please run git merge --continue and push the changes to this PR.

mpysiak and others added 2 commits March 17, 2025 11:43
| Q               | A
| --------------- | -----
| Branch?         | 1.6
| Bug fix?        | yes
| New feature?    | no
| Related tickets | n/a
@GSadee GSadee closed this Mar 17, 2025
@GSadee GSadee deleted the upmerge/1.6_1.7 branch March 17, 2025 11:18
@SyliusBot SyliusBot restored the upmerge/1.6_1.7 branch March 17, 2025 11:19
@SyliusBot SyliusBot deleted the upmerge/1.6_1.7 branch March 18, 2025 02:29
@SyliusBot SyliusBot restored the upmerge/1.6_1.7 branch March 19, 2025 02:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants