goffee/cup
1
0
Fork 2
Code Issues Pull requests 1 Projects Releases 14 Packages Wiki Activity Actions

develop #14

Open
zeni wants to merge 0 commits from develop into main
pull from: develop
merge into: goffee:main
Conversation 0 Commits - Files changed -
zeni commented 2025-07-15 12:32:45 -04:00
Owner
Copy link
  • add env vars for cdn and app
  • add sample element paginator
- add env vars for cdn and app - add sample element paginator
zeni added 4 commits 2025-07-15 12:32:46 -04:00
This pull request has changes conflicting with the target branch.
  • go.mod
  • go.sum
View command line instructions

Checkout

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

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 develop
git checkout develop
git rebase main
git checkout main
git merge --ff-only develop
git checkout develop
git rebase main
git checkout main
git merge --no-ff develop
git checkout main
git merge --squash develop
git checkout main
git merge --ff-only develop
git checkout main
git merge develop
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: goffee/cup#14
No description provided.
Delete branch "develop"

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?