git-workflow/tests
SHA256
16
0
Code Issues 30 Packages Projects Wiki

[WORKFLOW-PR][MERGE-011] MergeMode: replace (Merge-commit) #27

New Issue
Closed
opened 2026-03-03 22:16:07 +01:00 by atartamo · 0 comments
atartamo commented 2026-03-03 22:16:07 +01:00
Owner
Copy Link

Steps to Reproduce

  1. Set MergeMode = replace.
  2. Create a PackageGit PR that adds a new file.
  3. Enable Allow edits from maintainers on the PackageGit PR.
  4. Commit the same file with different content to the base branch to create a content conflict.
  5. Approve reviews.

Expected Results

  1. Both PRs are merged.
  2. The project branch HEAD is a merge commit.
  3. The pkgA submodule points to the PR's head SHA.
### Steps to Reproduce 1. Set `MergeMode = replace`. 2. Create a PackageGit PR that adds a new file. 3. Enable Allow edits from maintainers on the PackageGit PR. 4. Commit the same file with different content to the base branch to create a content conflict. 5. Approve reviews. ### Expected Results 1. Both PRs are merged. 2. The project branch HEAD is a merge commit. 3. The `pkgA` submodule points to the PR's head SHA.
andriinikitin was assigned by atartamo 2026-03-03 22:16:07 +01:00
atartamo added the
Priority
High
status
done
 labels 2026-03-03 22:17:11 +01:00
atartamo changed title from [TC-MERGE-011] MergeMode: replace (Merge-commit) to [WORKFLOW-PR][TC-MERGE] MergeMode: replace (Merge-commit) 2026-03-03 22:29:22 +01:00
atartamo added the
bot
workflow-pr
 label 2026-03-04 10:35:51 +01:00
atartamo changed title from [WORKFLOW-PR][TC-MERGE] MergeMode: replace (Merge-commit) to [WORKFLOW-PR][MERGE-011] MergeMode: replace (Merge-commit) 2026-03-04 14:46:22 +01:00
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
Priority
High
Priority
Medium
bot
staging
bot
workflow-pr
not-implemented
status
done
status
in-progress
status
todo
No Label
Priority
High
bot
workflow-pr
status
done
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
M0ses adamm adrianSuSE andriinikitin atartamo bigironman dancermak darix dirkmueller dmach eroca jdsn jzerebecki mmaslanova mstrigl oertel smithfarm
No Assignees andriinikitin
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: git-workflow/tests#27
Delete Branch "%!s()"

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?