#934 Add solar panel mockup with sub-compose stack #1062

Open
c24carso wants to merge 1 commit from #934-solar-panel-mockup-v2 into team_2_week_7
Collaborator

Added solar panel mockup system following the energy mockup style, updated to use the new sub-compose/stacks structure.

Added solar panel mockup system following the energy mockup style, updated to use the new sub-compose/stacks structure.
Added solar panel mockup system following the energy mockup style, updated to use the new sub-compose/stacks structure.
This pull request has changes conflicting with the target branch.
  • scripts/UnixRebuild.sh
  • scripts/UnixRebuildDebug.sh
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin #934-solar-panel-mockup-v2:#934-solar-panel-mockup-v2
git switch #934-solar-panel-mockup-v2

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 team_2_week_7
git merge --no-ff #934-solar-panel-mockup-v2
git switch #934-solar-panel-mockup-v2
git rebase team_2_week_7
git switch team_2_week_7
git merge --ff-only #934-solar-panel-mockup-v2
git switch #934-solar-panel-mockup-v2
git rebase team_2_week_7
git switch team_2_week_7
git merge --no-ff #934-solar-panel-mockup-v2
git switch team_2_week_7
git merge --squash #934-solar-panel-mockup-v2
git switch team_2_week_7
git merge --ff-only #934-solar-panel-mockup-v2
git switch team_2_week_7
git merge #934-solar-panel-mockup-v2
git push origin team_2_week_7
Sign in to join this conversation.
No reviewers
No milestone
No project
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
Andras/BoundlessFlowCampus2K!1062
No description provided.