git-workflow/autogits
SHA256
21
2
Fork 16
Code Issues 44 Pull Requests 19 Actions Projects 2 Activity

submodule conflict resolution #87

Open
adamm wants to merge 2 commits from submodulemerge into main
pull from: submodulemerge
merge into: git-workflow:main
Conversation 1 Commits 2 Files Changed 10 +668 -276
adamm commented 2025-10-28 19:45:29 +01:00
Owner
Copy Link

If merging a ProjectGit with submodules,

  • removed submodules are to be removed always
  • modified/added submodules are to be present
  • submodules modified in base project and PR should conflict
If merging a ProjectGit with submodules, * removed submodules are to be removed always * modified/added submodules are to be present * submodules modified in base project and PR should conflict
adamm added 1 commit 2025-10-28 19:45:29 +01:00
submodule conflict resolution 444959540a 
If merging a ProjectGit with submodules,
  * removed submodules are to be removed always
  * modified/added submodules are to be present
  * submodules modified in base project and PR should conflict
adamm added 1 commit 2025-10-29 13:02:50 +01:00
Add command line utility to automerge conflicts d5d6910906 
It assumes CWD is the root of the git project
adamm added 1 commit 2025-10-29 13:26:26 +01:00
utils: specfile fix 66a2c0565e
adamm force-pushed submodulemerge from 66a2c0565e to 03868953fd 2026-02-21 14:19:12 +01:00 Compare
adamm commented 2026-02-21 14:19:26 +01:00
Author
Owner
Copy Link

Rebased

Rebased
adamm requested review from jzerebecki 2026-02-21 14:19:46 +01:00
Some checks failed
go-generate-check / go-generate-check (pull_request) Failing after 30s
Details
This pull request has changes conflicting with the target branch.
  • common/git_utils_test.go
  • common/pr.go
  • common/pr_test.go
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin submodulemerge:submodulemerge
git checkout submodulemerge
Sign in to join this conversation.
Reviewers
No Reviewers
jzerebecki
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#87
Delete Branch "submodulemerge"

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?