submodule conflict resolution #87

Open

adamm wants to merge 2 commits from submodulemerge into main

pull from: submodulemerge

merge into: git-workflow:main

git-workflow:main

git-workflow:improve_podman_setup

git-workflow:t-staging-br-tests

git-workflow:fix/gitea-cache-ttl-sync

git-workflow:ci-experiments-stability

git-workflow:bugfix/timeline-race-conditions

git-workflow:env-disable-timeline-cache

git-workflow:t-split-common-func-in-merge-tests

git-workflow:bugfix/issueprocessor-not-triggered

git-workflow:ibs_state

git-workflow:relative_repo_urls

git-workflow:t-refactor-pytest-in-container

git-workflow:pr-pedantic-mode

git-workflow:m0ses_tc_merge_004

git-workflow:ci_cat_logs_on_failure

git-workflow:fix/timeline-cache-race

git-workflow:staging

git-workflow:pr-review-required-tweak

git-workflow:status

git-workflow:pending-reviews

git-workflow:t-sync-target-branch

git-workflow:fix-multiple-reviews-from-the-same-user

git-workflow:reparent

git-workflow:gitea-api-update

git-workflow:gitpkgs

git-workflow:wip_manual_prjgit_merge

git-workflow:status_service

git-workflow:conflicts

Conversation 1 Commits 2 Files Changed 10 +668 -276

2 Commits

Author	SHA256	Message	Date
Adam Majer	03868953fd	Add command line utility to automerge conflicts ... It assumes CWD is the root of the git project	2026-02-21 14:18:45 +01:00
Adam Majer	914149df7d	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	2026-02-21 14:12:22 +01:00