git-workflow/autogits
SHA256
19
0
Fork 8
Code Issues 43 Pull Requests 6 Projects 2 Activity

submodule conflict resolution #87

Open
adamm wants to merge 3 commits from submodulemerge into main
pull from: submodulemerge
merge into: git-workflow:main
Conversation 0 Commits 3 Files Changed 10 +684 -290
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
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 submodulemerge:submodulemerge
git checkout submodulemerge
Sign in to join this conversation.
Reviewers
No Reviewers
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#87
No description provided.
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?