bpinsard/test_repo
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

test_submodule_merge #1

Open
bpinsard wants to merge 2 commits from test_submodule_merge into main
pull from: test_submodule_merge
merge into: bpinsard:main
Conversation 0 Commits 2 Files changed 2 +6
bpinsard commented 2026-01-16 18:49:41 +00:00
Owner
Copy link
No description provided.
This pull request has changes conflicting with the target branch.
  • bids
View command line instructions

Checkout

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

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 test_submodule_merge
git switch test_submodule_merge
git rebase main
git switch main
git merge --ff-only test_submodule_merge
git switch test_submodule_merge
git rebase main
git switch main
git merge --no-ff test_submodule_merge
git switch main
git merge --squash test_submodule_merge
git switch main
git merge --ff-only test_submodule_merge
git switch main
git merge test_submodule_merge
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
bpinsard/test_repo!1
No description provided.