Configuration envoi de mails #6

Open
aandres wants to merge 1 commit from pole-mail into main
Owner
No description provided.
This pull request has changes conflicting with the target branch.
  • polesubscribe/settings.py
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 pole-mail:pole-mail
git switch pole-mail

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 main
git merge --no-ff pole-mail
git switch pole-mail
git rebase main
git switch main
git merge --ff-only pole-mail
git switch pole-mail
git rebase main
git switch main
git merge --no-ff pole-mail
git switch main
git merge --squash pole-mail
git switch main
git merge --ff-only pole-mail
git switch main
git merge pole-mail
git push origin main
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
aandres/poleSubscribe!6
No description provided.