rgutierrez/resq
1
0
Fork 0
Code Issues 126 Pull requests 49 Projects Releases 4 Packages Wiki Activity Actions

Resolve "Put fuel charges in env file" #1571

Open
korina.cordero wants to merge 2 commits from 634-put-fuel-charges-in-env-file into master
pull from: 634-put-fuel-charges-in-env-file
merge into: rgutierrez:master
Conversation 3 Commits 2 Files changed 3 +17 -6
korina.cordero commented 2022-03-09 08:20:17 +00:00 (Migrated from gitlab.com)
Copy link

Closes #634

Closes #634
korina.cordero commented 2022-03-09 09:15:45 +00:00 (Migrated from gitlab.com)
Copy link

added 1 commit

Compare with previous version

added 1 commit <ul><li>726d787e - Move to env file the fuel charges. #634</li></ul> [Compare with previous version](/jankstudio/resq/-/merge_requests/760/diffs?diff_id=347266575&start_sha=e986d07f70b9fec464c1a2297683866f06bd8341)
korina.cordero commented 2022-03-09 09:15:55 +00:00 (Migrated from gitlab.com)
Copy link

marked this merge request as ready

marked this merge request as **ready**
korina.cordero commented 2022-04-26 01:51:01 +00:00 (Migrated from gitlab.com)
Copy link

added 41 commits

  • 726d787e...4a93a2d4 - 40 commits from branch master
  • dc81db96 - Merge branch 'master' of gitlab.com:jankstudio/resq into 634-put-fuel-charges-in-env-file

Compare with previous version

added 41 commits <ul><li>726d787e...4a93a2d4 - 40 commits from branch <code>master</code></li><li>dc81db96 - Merge branch &#39;master&#39; of gitlab.com:jankstudio/resq into 634-put-fuel-charges-in-env-file</li></ul> [Compare with previous version](/jankstudio/resq/-/merge_requests/760/diffs?diff_id=380734304&start_sha=726d787ef1bbca586cf06e3432003529938ded98)
This pull request has changes conflicting with the target branch.
  • src/Service/InvoiceGenerator/ResqInvoiceGenerator.php
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin 634-put-fuel-charges-in-env-file:634-put-fuel-charges-in-env-file
git checkout 634-put-fuel-charges-in-env-file

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 checkout master
git merge --no-ff 634-put-fuel-charges-in-env-file
git checkout 634-put-fuel-charges-in-env-file
git rebase master
git checkout master
git merge --ff-only 634-put-fuel-charges-in-env-file
git checkout 634-put-fuel-charges-in-env-file
git rebase master
git checkout master
git merge --no-ff 634-put-fuel-charges-in-env-file
git checkout master
git merge --squash 634-put-fuel-charges-in-env-file
git checkout master
git merge --ff-only 634-put-fuel-charges-in-env-file
git checkout master
git merge 634-put-fuel-charges-in-env-file
git push origin master
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
API

   
AU

Marshall Battery Feature

  
Bug

Bug

  
CRM Enhancements

   
Mobile API

   
Nice to have

   
Phase 2

Local Phase 2

No labels
API
AU
Bug
CRM Enhancements
Mobile API
Nice to have
Phase 2
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: rgutierrez/resq#1571
No description provided.
Delete branch "634-put-fuel-charges-in-env-file"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?