Skip to content

[UPMERGE] 1.0 -> 2.0#362

Merged
GSadee merged 4 commits into2.0from
upmerge/1.0_2.0
Jan 10, 2025
Merged

[UPMERGE] 1.0 -> 2.0#362
GSadee merged 4 commits into2.0from
upmerge/1.0_2.0

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/2.0 -m "Resolve conflicts between 1.0 and 2.0"

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

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

@GSadee GSadee merged commit 814f964 into 2.0 Jan 10, 2025
73 of 98 checks passed
@GSadee GSadee deleted the upmerge/1.0_2.0 branch January 10, 2025 11:57
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.

5 participants