8
0
Fork
You've already forked libpEpAdapter
0

master #10

Open
leviathan wants to merge 16 commits from leviathan/master into master
pull from: leviathan/master
merge into: pEp:master
pEp:master
pEp:Release_3.2
pEp:Release_2.1
pEp:LIB-19
pEp:LIB-17
pEp:LIB-18
pEp:lucasaiu/message-struct-change
pEp:LIB-11
pEp:LIB-12
pEp:android-build
pEp:ENGINE-781
pEp:synchronous
pEp:sync
pEp:LPA-1
leviathan commented 2021年10月20日 16:09:54 +02:00 (Migrated from gitea.pep.foundation)
Copy link

Hi
Some minor fixes so that the adapter compiles with the most recent version of the pEpEngine

Hi Some minor fixes so that the adapter compiles with the most recent version of the pEpEngine
This pull request has changes conflicting with the target branch.
  • src/Adapter.hh
  • src/Makefile
  • src/std_utils.cc
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 leviathan/master:leviathan/master
git switch leviathan/master

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 leviathan/master
git switch leviathan/master
git rebase master
git switch master
git merge --ff-only leviathan/master
git switch leviathan/master
git rebase master
git switch master
git merge --no-ff leviathan/master
git switch master
git merge --squash leviathan/master
git switch master
git merge --ff-only leviathan/master
git switch master
git merge leviathan/master
git push origin master
Sign in to join this conversation.
No reviewers
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
pEp/libpEpAdapter!10
Reference in a new issue
pEp/libpEpAdapter
No description provided.
Delete branch "leviathan/master"

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?