informator/bme680-cpp
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Web CPP server base implementation #2

Open
informator wants to merge 1 commit from feat/webCPP into master
pull from: feat/webCPP
merge into: informator:master
Conversation 0 Commits 1 Files changed 19 +23979 -13
informator commented 2026-06-20 23:57:11 +01:00
Owner
Copy link
No description provided.
This pull request has changes conflicting with the target branch.
  • CMakeLists.txt
  • Makefile
  • setup.sh
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 feat/webCPP:feat/webCPP
git switch feat/webCPP

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 master
git merge --no-ff feat/webCPP
git switch feat/webCPP
git rebase master
git switch master
git merge --ff-only feat/webCPP
git switch feat/webCPP
git rebase master
git switch master
git merge --no-ff feat/webCPP
git switch master
git merge --squash feat/webCPP
git switch master
git merge --ff-only feat/webCPP
git switch master
git merge feat/webCPP
git push origin master
Sign in to join this conversation.
Reviewers
No reviewers
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
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
informator/bme680-cpp!2
No description provided.