avernois/pay_what_you_want
1
0
Fork 0
Code Issues 8 Pull requests 5 Projects Releases Packages Wiki Activity Actions

WIP: Resolve "Remove a product" #47

Draft
avernois wants to merge 6 commits from 5-remove-a-product_using-a-service into develop
pull from: 5-remove-a-product_using-a-service
merge into: avernois:develop
Conversation 1 Commits 6 Files changed 17 +275 -10
avernois commented 2019-05-03 10:13:26 +00:00 (Migrated from gitlab.com)
Copy link

Closes #5

Closes #5
avernois commented 2019-05-03 10:36:07 +00:00 (Migrated from gitlab.com)
Copy link

marked as a Work In Progress

marked as a **Work In Progress**
This pull request has changes conflicting with the target branch.
  • pay_what_you_want/pom.xml
  • pay_what_you_want/src/main/java/fr/craftinglabs/apps/paywhatyouwant/server/PayWhatYouWantServer.java
  • pay_what_you_want/src/main/java/fr/craftinglabs/apps/paywhatyouwant/server/Server.java
  • pay_what_you_want/src/test/java/fr/craftinglabs/apps/paywhatyouwant/server/ServerTest.java
  • pay_what_you_want_example/pom.xml
  • pay_what_you_want_example/src/main/java/PWYWExample.java
  • pom.xml
View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin 5-remove-a-product_using-a-service:5-remove-a-product_using-a-service
git switch 5-remove-a-product_using-a-service

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch develop
git merge --no-ff 5-remove-a-product_using-a-service
git switch 5-remove-a-product_using-a-service
git rebase develop
git switch develop
git merge --ff-only 5-remove-a-product_using-a-service
git switch 5-remove-a-product_using-a-service
git rebase develop
git switch develop
git merge --no-ff 5-remove-a-product_using-a-service
git switch develop
git merge --squash 5-remove-a-product_using-a-service
git switch develop
git merge --ff-only 5-remove-a-product_using-a-service
git switch develop
git merge 5-remove-a-product_using-a-service
git push origin develop
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
Doing

   
To Do

   
api

   
test
No labels
Doing
To Do
api
test
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
avernois/pay_what_you_want!47
No description provided.