git-workflow/autogits
SHA256
20
2
Fork 13
Code Issues 45 Pull Requests 12 Actions 1 Projects 2 Activity

Original PR and its "Forwarded PR" were not merged even if "autogits-devel" pushed its content #110

New Issue
Closed
opened 2026-01-15 17:08:17 +01:00 by PSuarezHernandez · 1 comment
PSuarezHernandez commented 2026-01-15 17:08:17 +01:00
Copy Link

In an environment with "pr" and "direct" bots enabled:

Few strange things that happened here:

  1. At some point, after some other "Forwarded PRs" were merged for different packages, this "Forwarded PR" got polluted with commits that are NOT related with the original PR. See https://src.opensuse.org/saltbundle/_ObsPrj/pulls/111/files
  2. At some point, the "autogits-devel" bot pushes the commit from the original PR to its target branch, but the original PR was never merged. I had to close it manually.
  3. The legitime changes for "_ObsPrj", after the commits from the original PR were pushed to its target branch, were pushed by direct workflow to "_ObsPrj": 45a48a5c7b
  4. The "Forwarded PR" was never set as merged, I had to close it manually.

In the end, as mentioned, both PRs were manually closed "without merging" but the changes got already in both repos (package and project repos).

In an environment with "pr" and "direct" bots enabled: - The original PR: https://src.opensuse.org/saltbundle/saltbundlepy-importlib-metadata/pulls/2 - The "Forwarded PR" created by "autogits-devel": https://src.opensuse.org/saltbundle/_ObsPrj/pulls/111 - The "manual merge" config was missing for the repo. Few strange things that happened here: 1. At some point, after some other "Forwarded PRs" were merged for different packages, this "Forwarded PR" got polluted with commits that are NOT related with the original PR. See https://src.opensuse.org/saltbundle/_ObsPrj/pulls/111/files 2. At some point, the "autogits-devel" bot pushes the commit from the original PR to its target branch, but the original PR was never merged. I had to close it manually. 3. The legitime changes for "_ObsPrj", after the commits from the original PR were pushed to its target branch, were pushed by direct workflow to "_ObsPrj": https://src.opensuse.org/saltbundle/_ObsPrj/commit/45a48a5c7b3245f001ce2e1905777d2828ef786a8755bec539508692813536d3 4. The "Forwarded PR" was never set as merged, I had to close it manually. In the end, as mentioned, both PRs were manually closed "without merging" but the changes got already in both repos (package and project repos).
PSuarezHernandez commented 2026-01-19 14:18:03 +01:00
Author
Copy Link

Moving this issue to GitHub: https://github.com/openSUSE/openSUSE-git/issues/219

Closing issue

Moving this issue to GitHub: https://github.com/openSUSE/openSUSE-git/issues/219 Closing issue
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
No items
No Label
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
M0ses adamm 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#110
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?