lyes/nixfiles
1
0
Fork 0
Code Issues Pull requests 1 Activity Actions

LDAP switch for taf #2

Open
lyes wants to merge 1 commit from mail-ldap into main
pull from: mail-ldap
merge into: lyes:main
Conversation 0 Commits 1 Files changed 9 +118 -174
lyes commented 2026-02-15 03:48:59 +01:00
Owner
Copy link
No description provided.
lyes added 1 commit 2026-02-15 03:49:00 +01:00
This pull request has changes conflicting with the target branch.
  • modules/server/link/default.nix
  • modules/server/taf/default.nix
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin mail-ldap:mail-ldap
git checkout mail-ldap

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 main
git merge --no-ff mail-ldap
git checkout mail-ldap
git rebase main
git checkout main
git merge --ff-only mail-ldap
git checkout mail-ldap
git rebase main
git checkout main
git merge --no-ff mail-ldap
git checkout main
git merge --squash mail-ldap
git checkout main
git merge --ff-only mail-ldap
git checkout main
git merge mail-ldap
git push origin main
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: lyes/nixfiles#2
No description provided.
Delete branch "mail-ldap"

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?