re2o/mailing
5
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

remove typo #2

Open
chapeau wants to merge 2 commits from nouvelle_api into master
pull from: nouvelle_api
merge into: re2o:master
Conversation 1 Commits 2 Files changed 2 +10 -3
chapeau commented 2020-04-14 16:21:41 +02:00 (Migrated from gitlab2.federez.net)
Copy link
No description provided.
chapeau commented 2020-08-07 22:58:39 +02:00 (Migrated from gitlab2.federez.net)
Copy link

added 1 commit

Compare with previous version

By nanoy on 2020-08-07T20:58:39 (imported from GitLab)

added 1 commit <ul><li>b3ce1369 - Add exclude and include</li></ul> [Compare with previous version](/re2o/mailing/-/merge_requests/2/diffs?diff_id=1622&start_sha=1357b67334144f36d835c484718b6f409cce152f) *By nanoy on 2020-08-07T20:58:39 (imported from GitLab)*
This pull request has changes conflicting with the target branch.
  • sync_adherents_mailman.py
View command line instructions

Checkout

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

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 master
git merge --no-ff nouvelle_api
git checkout nouvelle_api
git rebase master
git checkout master
git merge --ff-only nouvelle_api
git checkout nouvelle_api
git rebase master
git checkout master
git merge --no-ff nouvelle_api
git checkout master
git merge --squash nouvelle_api
git checkout master
git merge --ff-only nouvelle_api
git checkout master
git merge nouvelle_api
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: re2o/mailing#2
No description provided.
Delete branch "nouvelle_api"

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?