cronekorkn/bundlewrap
1
0
Fork 0
Code Issues Pull requests 8 Projects Releases Wiki Activity

freescout #16

Open
cronekorkn wants to merge 6 commits from freescout into master
pull from: freescout
merge into: cronekorkn:master
Conversation 0 Commits 6 Files changed 18 +371 -34
cronekorkn commented 2024-02-08 13:50:03 +01:00
Owner
Copy link
No description provided.
cronekorkn added 1 commit 2024-02-08 13:50:03 +01:00
cronekorkn added 1 commit 2024-02-08 16:16:00 +01:00
cronekorkn added 1 commit 2024-02-08 16:22:59 +01:00
cronekorkn added 1 commit 2024-03-15 15:46:53 +01:00
cronekorkn force-pushed freescout from 54899d59ad to 546bc5a445 2024-04-26 15:08:18 +02:00 Compare
cronekorkn added 1 commit 2024-04-30 14:08:33 +02:00
cronekorkn force-pushed freescout from b9b10623ec to e39deddf7c 2024-08-20 18:03:52 +02:00 Compare
cronekorkn added 1 commit 2024-08-30 09:42:01 +02:00
This pull request has changes conflicting with the target branch.
  • bundles/freescout/README.md
  • bundles/freescout/items.py
  • bundles/freescout/metadata.py
  • libs/tools.py
  • nodes/home.server.py
  • nodes/mseibert.freescout.py
  • nodes/netcup.mails.py
View command line instructions

Checkout

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

Merge

Merge the changes and update on Forgejo.
git checkout master
git merge --no-ff freescout
git checkout master
git merge --ff-only freescout
git checkout freescout
git rebase master
git checkout master
git merge --no-ff freescout
git checkout master
git merge --squash freescout
git checkout master
git merge --ff-only freescout
git checkout master
git merge freescout
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: cronekorkn/bundlewrap#16
No description provided.
Delete branch "freescout"

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?