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

WIP: Resolve "List product status" #55

Draft
avernois wants to merge 4 commits from 6-list-product-status into develop
pull from: 6-list-product-status
merge into: avernois:develop
Conversation 2 Commits 4 Files changed 8 +151 -10
avernois commented 2020-01-13 09:53:22 +00:00 (Migrated from gitlab.com)
Copy link

Closes #6

Closes #6
avernois commented 2020-01-14 08:59:04 +00:00 (Migrated from gitlab.com)
Copy link

added 4 commits

  • 65999825 - Add a way to list stock of products
  • 605177be - Add an action to list products and their quantities
  • 53817a6a - wip
  • 5ecdacca - wip: Add a way to export stocks

Compare with previous version

added 4 commits <ul><li>65999825 - Add a way to list stock of products</li><li>605177be - Add an action to list products and their quantities</li><li>53817a6a - wip</li><li>5ecdacca - wip: Add a way to export stocks</li></ul> [Compare with previous version](/avernois/pay_what_you_want-stripe/merge_requests/38/diffs?diff_id=70703549&start_sha=e324097be787db501e434d78119eb2a7f30f46d3)
avernois commented 2020-01-27 09:19:21 +00:00 (Migrated from gitlab.com)
Copy link

added 5 commits

  • ad07a147 - 1 commit from branch develop
  • c0b02ad3 - Add a way to list stock of products
  • 2cfc9167 - Add an action to list products and their quantities
  • 0f9e5069 - wip
  • e2be9d76 - wip: Add a way to export stocks

Compare with previous version

added 5 commits <ul><li>ad07a147 - 1 commit from branch <code>develop</code></li><li>c0b02ad3 - Add a way to list stock of products</li><li>2cfc9167 - Add an action to list products and their quantities</li><li>0f9e5069 - wip</li><li>e2be9d76 - wip: Add a way to export stocks</li></ul> [Compare with previous version](/avernois/pay_what_you_want-stripe/merge_requests/38/diffs?diff_id=72615864&start_sha=5ecdacca2946234509baa700ef069545ae934200)
This pull request has changes conflicting with the target branch.
  • pay_what_you_want/src/test/java/fr/craftinglabs/apps/paywhatyouwant/server/ServerTest.java
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 6-list-product-status:6-list-product-status
git switch 6-list-product-status

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 6-list-product-status
git switch 6-list-product-status
git rebase develop
git switch develop
git merge --ff-only 6-list-product-status
git switch 6-list-product-status
git rebase develop
git switch develop
git merge --no-ff 6-list-product-status
git switch develop
git merge --squash 6-list-product-status
git switch develop
git merge --ff-only 6-list-product-status
git switch develop
git merge 6-list-product-status
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!55
No description provided.