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.

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

[UPMERGE] 1.0 -> 2.0 #362

Open
wants to merge 4 commits into
base: 2.0
Choose a base branch
from
Open

[UPMERGE] 1.0 -> 2.0 #362

wants to merge 4 commits into from

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.

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