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

Resolve "Add the add battery test command" #1075

Open
korina.cordero wants to merge 3 commits from 225-add-the-add-battery-test-command into master
pull from: 225-add-the-add-battery-test-command
merge into: rgutierrez:master
Conversation 3 Commits 3 Files changed 2 +13
korina.cordero commented 2019-06-19 07:26:23 +00:00 (Migrated from gitlab.com)
Copy link

Closes #225

Closes #225
korina.cordero commented 2019-06-19 07:29:39 +00:00 (Migrated from gitlab.com)
Copy link

added 2 commits

Compare with previous version

added 2 commits <ul><li>f914b7c4 - Add the add battery to the test API command. #225</li><li>e8336897 - Removed redundant test command. #225</li></ul> [Compare with previous version](/jankstudio/resq/merge_requests/264/diffs?diff_id=45701183&start_sha=ec9ca5cad9fd11f2690bbd6feab54a05c6c18d07)
korina.cordero commented 2019-06-19 07:34:13 +00:00 (Migrated from gitlab.com)
Copy link

added 1 commit

Compare with previous version

added 1 commit <ul><li>faf68325 - Restored the TestCommand.php. #225</li></ul> [Compare with previous version](/jankstudio/resq/merge_requests/264/diffs?diff_id=45701654&start_sha=e8336897ca9a4f3639cf76bcadb3660ba6010b6b)
korina.cordero commented 2019-06-19 07:35:37 +00:00 (Migrated from gitlab.com)
Copy link

unmarked as a Work In Progress

unmarked as a **Work In Progress**
This pull request has changes conflicting with the target branch.
  • catalyst/api-bundle/Command/TestAPICommand.php
  • catalyst/api-bundle/Command/TestCommand.php
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin 225-add-the-add-battery-test-command:225-add-the-add-battery-test-command
git checkout 225-add-the-add-battery-test-command

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 225-add-the-add-battery-test-command
git checkout 225-add-the-add-battery-test-command
git rebase master
git checkout master
git merge --ff-only 225-add-the-add-battery-test-command
git checkout 225-add-the-add-battery-test-command
git rebase master
git checkout master
git merge --no-ff 225-add-the-add-battery-test-command
git checkout master
git merge --squash 225-add-the-add-battery-test-command
git checkout master
git merge --ff-only 225-add-the-add-battery-test-command
git checkout master
git merge 225-add-the-add-battery-test-command
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#1075
No description provided.
Delete branch "225-add-the-add-battery-test-command"

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?