git-workflow/autogits
SHA256
21
2
Fork 15
Code Issues 48 Pull Requests 15 Actions Projects 2 Activity

mergemodes #131

Open
adamm wants to merge 2 commits from mergemodes into main
pull from: mergemodes
merge into: git-workflow:main
Conversation 2 Commits 2 Files Changed 6 +600 -9
adamm commented 2026-02-20 02:08:11 +01:00
Owner
Copy Link
No description provided.
adamm added 2 commits 2026-02-20 02:08:11 +01:00
pr: add merge modes documentation and config parsing 53eebb75f7
pr: add function that checks and prepares PRs
All checks were successful
go-generate-check / go-generate-check (pull_request) Successful in 26s
Details
db70452cbc
adamm commented 2026-02-20 02:13:00 +01:00
Author
Owner
Copy Link
Merge Mode Description
ff-only Only allow --ff-only merges in the package branch. This is best suited for
devel projects and openSUSE Tumbleweed development, where history should be linear
replace Merge is done via -X theirs strategy and old files are removed in the merge.
This works well for downstream codestreams, like Leap, that would update their branch
using latest version.
devel No merge, just set the project branch to PR HEAD. This is suitable for downstream
projects like Leap during development cycle, where keeping maintenance history is not important
| Merge Mode | Description |------------|-------------------------------------------------------------------------------- | ff-only | Only allow --ff-only merges in the package branch. This is best suited for | | devel projects and openSUSE Tumbleweed development, where history should be linear | replace | Merge is done via `-X theirs` strategy and old files are removed in the merge. | | This works well for downstream codestreams, like Leap, that would update their branch | | using latest version. | devel | No merge, just set the project branch to PR HEAD. This is suitable for downstream | | projects like Leap during development cycle, where keeping maintenance history is not important
adamm commented 2026-02-20 02:16:07 +01:00
Author
Owner
Copy Link

I've tested that "replace" mode adds a merge commit to the source repo.

testing/xz#3

Consequence is it makes the unrelated histories have a diff again.

"devel" mode is untested

I've tested that "replace" mode adds a merge commit to the source repo. https://src.opensuse.org/testing/xz/pulls/3 Consequence is it makes the unrelated histories have a diff again. "devel" mode is untested
adamm requested review from atartamo 2026-02-20 02:16:26 +01:00
All checks were successful
go-generate-check / go-generate-check (pull_request) Successful in 26s
Details
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 mergemodes:mergemodes
git checkout mergemodes
Sign in to join this conversation.
Reviewers
No Reviewers
atartamo
Labels
No items
No Label
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
M0ses adamm adamm_super adrianSuSE andriinikitin atartamo bigironman dancermak darix dirkmueller dmach eroca jdsn jzerebecki mstrigl oertel smithfarm
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: git-workflow/autogits#131
Delete Branch "mergemodes"

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?