git-workflow/autogits
SHA256
19
0
Fork 8
Code Issues 43 Pull Requests 6 Projects 2 Activity
689 Commits 9 Branches 1 Tag
submodulemerge
Commit Graph

2 Commits

Author SHA256 Message Date
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
Jan Zerebecki
4604aaeeba Rename bots-common to common 
to make it match the name it is imported as
 2025-04-03 22:38:28 +02:00