bruno/brown-street
1
0
Fork 0
Code Issues 2 Pull requests 1 Projects Releases Packages Wiki Activity Actions 2

option1 #7

Open
bruno wants to merge 14 commits from option1 into main
pull from: option1
merge into: bruno:main
Conversation 0 Commits 14 Files changed 1 +282 -8
bruno commented 2026-05-17 22:34:13 +00:00
Owner
Copy link
No description provided.
bruno added 14 commits 2026-05-17 22:34:14 +00:00 
# Conflicts:
#	model.ifc
# Conflicts:
#	model.ifc
# Conflicts:
#	model.ifc
# Conflicts:
#	model.ifc
# Conflicts:
#	model.ifc
# Conflicts:
#	model.ifc
# Conflicts:
#	model.ifc
This pull request can be merged automatically.
This branch is out-of-date with the base branch
You are not authorized to merge this pull request.
View command line instructions

Checkout

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

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 option1
git checkout option1
git rebase main
git checkout main
git merge --ff-only option1
git checkout option1
git rebase main
git checkout main
git merge --no-ff option1
git checkout main
git merge --squash option1
git checkout main
git merge --ff-only option1
git checkout main
git merge option1
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: bruno/brown-street#7
No description provided.
Delete branch "option1"

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?