pakin/libtbr
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

Merge brew-master into feat/dry-test #1

New issue
Open
opened 2025-11-27 16:50:13 +07:00 by pakin · 1 comment
pakin commented 2025-11-27 16:50:13 +07:00
Owner
Copy link
Auto-merging .gitignore
CONFLICT (content): Merge conflict in .gitignore
Auto-merging app/build.gradle
CONFLICT (content): Merge conflict in app/build.gradle
Auto-merging app/src/main/AndroidManifest.xml
CONFLICT (content): Merge conflict in app/src/main/AndroidManifest.xml
Auto-merging app/src/main/java/com/forthvending/coffeemain/MainActivity.java
Auto-merging app/src/main/java/com/forthvending/coffeemain/MainMenu.java
CONFLICT (content): Merge conflict in app/src/main/java/com/forthvending/coffeemain/MainMenu.java
Auto-merging app/src/main/java/com/forthvending/coffeemain/helper/TimeWatch.java
CONFLICT (add/add): Merge conflict in app/src/main/java/com/forthvending/coffeemain/helper/TimeWatch.java
CONFLICT (file location): app/src/main/java/com/forthvending/coffeemain/newui/mainmenu/MainMenuActions.java added in brew-master inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to app/src/main/java/com/forthvending/coffeemain/newui/activities/mainmenu/MainMenuActions.java.
Auto-merging app/src/main/java/com/forthvending/coffeemain/newui/activities/mainmenu/MainMenuActivity.java
CONFLICT (content): Merge conflict in app/src/main/java/com/forthvending/coffeemain/newui/activities/mainmenu/MainMenuActivity.java
Auto-merging app/src/main/java/com/forthvending/coffeemain/newui/activities/mainmenu/MainMenuHandler.java
Auto-merging app/src/main/java/com/forthvending/coffeemain/newui/activities/systemtest/SidebarController.java
CONFLICT (content): Merge conflict in app/src/main/java/com/forthvending/coffeemain/newui/activities/systemtest/SidebarController.java
Auto-merging app/src/main/java/com/forthvending/coffeemain/newui/activities/systemtest/SystemTestActivity.java
CONFLICT (content): Merge conflict in app/src/main/java/com/forthvending/coffeemain/newui/activities/systemtest/SystemTestActivity.java
Auto-merging app/src/main/java/com/forthvending/coffeemain/newui/activities/systemtest/body/Calibrate.java
CONFLICT (content): Merge conflict in app/src/main/java/com/forthvending/coffeemain/newui/activities/systemtest/body/Calibrate.java
Auto-merging app/src/main/java/com/forthvending/coffeemain/newui/activities/systemtest/body/CupsAndArms.java
CONFLICT (content): Merge conflict in app/src/main/java/com/forthvending/coffeemain/newui/activities/systemtest/body/CupsAndArms.java
Auto-merging app/src/main/java/com/forthvending/coffeemain/newui/activities/systemtest/body/CupsArms_MoveArms.java
CONFLICT (content): Merge conflict in app/src/main/java/com/forthvending/coffeemain/newui/activities/systemtest/body/CupsArms_MoveArms.java
Auto-merging app/src/main/java/com/forthvending/coffeemain/newui/activities/systemtest/body/CupsArms_SetArms.java
CONFLICT (content): Merge conflict in app/src/main/java/com/forthvending/coffeemain/newui/activities/systemtest/body/CupsArms_SetArms.java
Auto-merging app/src/main/java/com/forthvending/coffeemain/newui/activities/systemtest/body/Fan.java
CONFLICT (content): Merge conflict in app/src/main/java/com/forthvending/coffeemain/newui/activities/systemtest/body/Fan.java
Auto-merging app/src/main/java/com/forthvending/coffeemain/newui/activities/systemtest/body/FrontDoor.java
CONFLICT (content): Merge conflict in app/src/main/java/com/forthvending/coffeemain/newui/activities/systemtest/body/FrontDoor.java
Auto-merging app/src/main/java/com/forthvending/coffeemain/newui/activities/systemtest/body/Mechanism.java
CONFLICT (content): Merge conflict in app/src/main/java/com/forthvending/coffeemain/newui/activities/systemtest/body/Mechanism.java
Auto-merging app/src/main/java/com/forthvending/coffeemain/newui/activities/systemtest/body/Powder.java
CONFLICT (content): Merge conflict in app/src/main/java/com/forthvending/coffeemain/newui/activities/systemtest/body/Powder.java
Auto-merging app/src/main/java/com/forthvending/coffeemain/newui/activities/systemtest/body/TestCoffee.java
CONFLICT (content): Merge conflict in app/src/main/java/com/forthvending/coffeemain/newui/activities/systemtest/body/TestCoffee.java
Auto-merging app/src/main/java/com/forthvending/coffeemain/newui/activities/systemtest/body/TestCoffee_BrewTest.java
CONFLICT (content): Merge conflict in app/src/main/java/com/forthvending/coffeemain/newui/activities/systemtest/body/TestCoffee_BrewTest.java
Auto-merging app/src/main/java/com/forthvending/coffeemain/newui/activities/systemtest/body/TestCoffee_PayGrind.java
CONFLICT (content): Merge conflict in app/src/main/java/com/forthvending/coffeemain/newui/activities/systemtest/body/TestCoffee_PayGrind.java
Auto-merging app/src/main/java/com/forthvending/coffeemain/newui/activities/systemtest/body/Water.java
CONFLICT (content): Merge conflict in app/src/main/java/com/forthvending/coffeemain/newui/activities/systemtest/body/Water.java
Auto-merging app/src/main/java/com/forthvending/coffeemain/newui/activities/systemtest/body/Whipper_BlendTest.java
Auto-merging app/src/main/java/com/forthvending/coffeemain/newui/activities/systemtest/body/Whipper_Move.java
CONFLICT (content): Merge conflict in app/src/main/java/com/forthvending/coffeemain/newui/activities/systemtest/body/Whipper_Move.java
Auto-merging app/src/main/java/com/forthvending/coffeemain/newui/activities/systemtest/body/Whipper_Speed.java
CONFLICT (content): Merge conflict in app/src/main/java/com/forthvending/coffeemain/newui/activities/systemtest/body/Whipper_Speed.java
Auto-merging app/src/main/java/com/forthvending/coffeemain/newui/activities/systemtest/body/ice/Ice.java
CONFLICT (content): Merge conflict in app/src/main/java/com/forthvending/coffeemain/newui/activities/systemtest/body/ice/Ice.java
Auto-merging app/src/main/java/com/forthvending/coffeemain/newui/activities/systemtest/body/ice/MoveAndPay.java
Auto-merging app/src/main/java/com/forthvending/coffeemain/newui/activities/systemtest/body/ice/SetIce.java
Auto-merging app/src/main/java/com/forthvending/coffeemain/newui/activities/systemtest/body/setting/Setting.java
CONFLICT (content): Merge conflict in app/src/main/java/com/forthvending/coffeemain/newui/activities/systemtest/body/setting/Setting.java
Auto-merging app/src/main/java/com/forthvending/coffeemain/newui/activities/systemtest/body/sodasyrup/SodaSyrup.java
CONFLICT (content): Merge conflict in app/src/main/java/com/forthvending/coffeemain/newui/activities/systemtest/body/sodasyrup/SodaSyrup.java
Auto-merging app/src/main/java/com/forthvending/coffeemain/newui/activities/systemtest/body/sodasyrup/SodaSyrup_Pay.java
CONFLICT (content): Merge conflict in app/src/main/java/com/forthvending/coffeemain/newui/activities/systemtest/body/sodasyrup/SodaSyrup_Pay.java
Auto-merging app/src/main/java/com/forthvending/coffeemain/newui/activities/systemtest/body/sodasyrup/SodaSyrup_SetSoda.java
CONFLICT (content): Merge conflict in app/src/main/java/com/forthvending/coffeemain/newui/activities/systemtest/body/sodasyrup/SodaSyrup_SetSoda.java
Auto-merging app/src/main/java/com/forthvending/coffeemain/newui/popup/Popup.java
Auto-merging app/src/main/java/com/forthvending/coffeemain/newui/popup/PromptPopup.java
CONFLICT (content): Merge conflict in app/src/main/java/com/forthvending/coffeemain/newui/popup/PromptPopup.java
Auto-merging app/src/main/java/com/forthvending/forthlib/CoffeeControl.java
CONFLICT (content): Merge conflict in app/src/main/java/com/forthvending/forthlib/CoffeeControl.java
Auto-merging app/src/main/java/com/forthvending/forthlib/IceControl.java
Auto-merging app/src/main/java/com/forthvending/forthlib/MachineShedule.java
Auto-merging app/src/main/java/com/forthvending/forthlib/backEndService.java
Auto-merging app/src/main/java/com/forthvending/forthlib/common.java
Auto-merging app/src/main/res/layout/activity_main_menu_new.xml
Auto-merging app/src/main/res/values/strings.xml
Automatic merge failed; fix conflicts and then commit the result.
``` Auto-merging .gitignore CONFLICT (content): Merge conflict in .gitignore Auto-merging app/build.gradle CONFLICT (content): Merge conflict in app/build.gradle Auto-merging app/src/main/AndroidManifest.xml CONFLICT (content): Merge conflict in app/src/main/AndroidManifest.xml Auto-merging app/src/main/java/com/forthvending/coffeemain/MainActivity.java Auto-merging app/src/main/java/com/forthvending/coffeemain/MainMenu.java CONFLICT (content): Merge conflict in app/src/main/java/com/forthvending/coffeemain/MainMenu.java Auto-merging app/src/main/java/com/forthvending/coffeemain/helper/TimeWatch.java CONFLICT (add/add): Merge conflict in app/src/main/java/com/forthvending/coffeemain/helper/TimeWatch.java CONFLICT (file location): app/src/main/java/com/forthvending/coffeemain/newui/mainmenu/MainMenuActions.java added in brew-master inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to app/src/main/java/com/forthvending/coffeemain/newui/activities/mainmenu/MainMenuActions.java. Auto-merging app/src/main/java/com/forthvending/coffeemain/newui/activities/mainmenu/MainMenuActivity.java CONFLICT (content): Merge conflict in app/src/main/java/com/forthvending/coffeemain/newui/activities/mainmenu/MainMenuActivity.java Auto-merging app/src/main/java/com/forthvending/coffeemain/newui/activities/mainmenu/MainMenuHandler.java Auto-merging app/src/main/java/com/forthvending/coffeemain/newui/activities/systemtest/SidebarController.java CONFLICT (content): Merge conflict in app/src/main/java/com/forthvending/coffeemain/newui/activities/systemtest/SidebarController.java Auto-merging app/src/main/java/com/forthvending/coffeemain/newui/activities/systemtest/SystemTestActivity.java CONFLICT (content): Merge conflict in app/src/main/java/com/forthvending/coffeemain/newui/activities/systemtest/SystemTestActivity.java Auto-merging app/src/main/java/com/forthvending/coffeemain/newui/activities/systemtest/body/Calibrate.java CONFLICT (content): Merge conflict in app/src/main/java/com/forthvending/coffeemain/newui/activities/systemtest/body/Calibrate.java Auto-merging app/src/main/java/com/forthvending/coffeemain/newui/activities/systemtest/body/CupsAndArms.java CONFLICT (content): Merge conflict in app/src/main/java/com/forthvending/coffeemain/newui/activities/systemtest/body/CupsAndArms.java Auto-merging app/src/main/java/com/forthvending/coffeemain/newui/activities/systemtest/body/CupsArms_MoveArms.java CONFLICT (content): Merge conflict in app/src/main/java/com/forthvending/coffeemain/newui/activities/systemtest/body/CupsArms_MoveArms.java Auto-merging app/src/main/java/com/forthvending/coffeemain/newui/activities/systemtest/body/CupsArms_SetArms.java CONFLICT (content): Merge conflict in app/src/main/java/com/forthvending/coffeemain/newui/activities/systemtest/body/CupsArms_SetArms.java Auto-merging app/src/main/java/com/forthvending/coffeemain/newui/activities/systemtest/body/Fan.java CONFLICT (content): Merge conflict in app/src/main/java/com/forthvending/coffeemain/newui/activities/systemtest/body/Fan.java Auto-merging app/src/main/java/com/forthvending/coffeemain/newui/activities/systemtest/body/FrontDoor.java CONFLICT (content): Merge conflict in app/src/main/java/com/forthvending/coffeemain/newui/activities/systemtest/body/FrontDoor.java Auto-merging app/src/main/java/com/forthvending/coffeemain/newui/activities/systemtest/body/Mechanism.java CONFLICT (content): Merge conflict in app/src/main/java/com/forthvending/coffeemain/newui/activities/systemtest/body/Mechanism.java Auto-merging app/src/main/java/com/forthvending/coffeemain/newui/activities/systemtest/body/Powder.java CONFLICT (content): Merge conflict in app/src/main/java/com/forthvending/coffeemain/newui/activities/systemtest/body/Powder.java Auto-merging app/src/main/java/com/forthvending/coffeemain/newui/activities/systemtest/body/TestCoffee.java CONFLICT (content): Merge conflict in app/src/main/java/com/forthvending/coffeemain/newui/activities/systemtest/body/TestCoffee.java Auto-merging app/src/main/java/com/forthvending/coffeemain/newui/activities/systemtest/body/TestCoffee_BrewTest.java CONFLICT (content): Merge conflict in app/src/main/java/com/forthvending/coffeemain/newui/activities/systemtest/body/TestCoffee_BrewTest.java Auto-merging app/src/main/java/com/forthvending/coffeemain/newui/activities/systemtest/body/TestCoffee_PayGrind.java CONFLICT (content): Merge conflict in app/src/main/java/com/forthvending/coffeemain/newui/activities/systemtest/body/TestCoffee_PayGrind.java Auto-merging app/src/main/java/com/forthvending/coffeemain/newui/activities/systemtest/body/Water.java CONFLICT (content): Merge conflict in app/src/main/java/com/forthvending/coffeemain/newui/activities/systemtest/body/Water.java Auto-merging app/src/main/java/com/forthvending/coffeemain/newui/activities/systemtest/body/Whipper_BlendTest.java Auto-merging app/src/main/java/com/forthvending/coffeemain/newui/activities/systemtest/body/Whipper_Move.java CONFLICT (content): Merge conflict in app/src/main/java/com/forthvending/coffeemain/newui/activities/systemtest/body/Whipper_Move.java Auto-merging app/src/main/java/com/forthvending/coffeemain/newui/activities/systemtest/body/Whipper_Speed.java CONFLICT (content): Merge conflict in app/src/main/java/com/forthvending/coffeemain/newui/activities/systemtest/body/Whipper_Speed.java Auto-merging app/src/main/java/com/forthvending/coffeemain/newui/activities/systemtest/body/ice/Ice.java CONFLICT (content): Merge conflict in app/src/main/java/com/forthvending/coffeemain/newui/activities/systemtest/body/ice/Ice.java Auto-merging app/src/main/java/com/forthvending/coffeemain/newui/activities/systemtest/body/ice/MoveAndPay.java Auto-merging app/src/main/java/com/forthvending/coffeemain/newui/activities/systemtest/body/ice/SetIce.java Auto-merging app/src/main/java/com/forthvending/coffeemain/newui/activities/systemtest/body/setting/Setting.java CONFLICT (content): Merge conflict in app/src/main/java/com/forthvending/coffeemain/newui/activities/systemtest/body/setting/Setting.java Auto-merging app/src/main/java/com/forthvending/coffeemain/newui/activities/systemtest/body/sodasyrup/SodaSyrup.java CONFLICT (content): Merge conflict in app/src/main/java/com/forthvending/coffeemain/newui/activities/systemtest/body/sodasyrup/SodaSyrup.java Auto-merging app/src/main/java/com/forthvending/coffeemain/newui/activities/systemtest/body/sodasyrup/SodaSyrup_Pay.java CONFLICT (content): Merge conflict in app/src/main/java/com/forthvending/coffeemain/newui/activities/systemtest/body/sodasyrup/SodaSyrup_Pay.java Auto-merging app/src/main/java/com/forthvending/coffeemain/newui/activities/systemtest/body/sodasyrup/SodaSyrup_SetSoda.java CONFLICT (content): Merge conflict in app/src/main/java/com/forthvending/coffeemain/newui/activities/systemtest/body/sodasyrup/SodaSyrup_SetSoda.java Auto-merging app/src/main/java/com/forthvending/coffeemain/newui/popup/Popup.java Auto-merging app/src/main/java/com/forthvending/coffeemain/newui/popup/PromptPopup.java CONFLICT (content): Merge conflict in app/src/main/java/com/forthvending/coffeemain/newui/popup/PromptPopup.java Auto-merging app/src/main/java/com/forthvending/forthlib/CoffeeControl.java CONFLICT (content): Merge conflict in app/src/main/java/com/forthvending/forthlib/CoffeeControl.java Auto-merging app/src/main/java/com/forthvending/forthlib/IceControl.java Auto-merging app/src/main/java/com/forthvending/forthlib/MachineShedule.java Auto-merging app/src/main/java/com/forthvending/forthlib/backEndService.java Auto-merging app/src/main/java/com/forthvending/forthlib/common.java Auto-merging app/src/main/res/layout/activity_main_menu_new.xml Auto-merging app/src/main/res/values/strings.xml Automatic merge failed; fix conflicts and then commit the result. ```
pakin self-assigned this 2025-11-27 16:50:13 +07:00
pakin commented 2025-11-27 16:50:36 +07:00
Author
Owner
Copy link

Temporary issues on libtbr.

Temporary issues on `libtbr`.
Sign in to join this conversation.
No Branch/Tag specified
Branches Tags
master
No results found.
Labels
Clear labels
No items
No labels
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
pakin
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: pakin/libtbr#1
No description provided.
Delete branch "%!s()"

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?