submodule conflict resolution #87

Open

adamm wants to merge 3 commits from submodulemerge into main

pull from: submodulemerge

merge into: git-workflow:main

git-workflow:main

git-workflow:relative_repo_urls

git-workflow:reparent

git-workflow:gitea-api-update

git-workflow:new-packages

git-workflow:gitpkgs

git-workflow:git-deadlock-fix

git-workflow:staging

git-workflow:wip_manual_prjgit_merge

git-workflow:spec

git-workflow:status_service

git-workflow:conflicts

Conversation 0 Commits 3 Files Changed 10 +684 -290

3 Commits

Author	SHA256	Message	Date
Adam Majer	66a2c0565e	utils: specfile fix	2025-10-29 13:26:16 +01:00
Adam Majer	d5d6910906	Add command line utility to automerge conflicts ... It assumes CWD is the root of the git project	2025-10-29 13:01:25 +01:00
Adam Majer	444959540a	submodule conflict resolution ... 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	2025-10-28 19:43:03 +01:00