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
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
e5cad365ee
Run go tests from rpm check
...
Skip some failing tests to be able to run the rest.
Add missing config to make git commit succeed inside rpmbuild.
2025-10-27 14:42:21 +01:00
c5db1c83a7
PR: detect and rebase project git commits
...
When project is advanced, and we have other package changes
to same project, the project git changes need to be rebased. The
simplest way of doing this is to skip all the submodule conflicts
and re-create them. This allows the submodules changes to be
mergeable again.
2025-07-15 19:08:05 +02:00
4653904ded
pr: merge - preliminary fixes
2025-05-09 17:28:35 +02:00
41d536ea1b
common: fix parsing commit messages
2025-05-08 10:42:33 +02:00
9963ae90ef
common: fix tests
2025-05-07 12:45:26 +02:00
801fff6e22
common: fix parsing commit messages
2025-05-07 12:31:11 +02:00
da1df24666
wip
2025-05-06 18:06:04 +02:00
0d0fcef7ac
staging: fixes
2025-05-04 20:45:33 +02:00
62a597718b
fix parsing test
2025-05-03 14:34:33 +02:00
327cb4ceaf
fixes if git cat-file has error
2025-05-02 22:46:31 +02:00
aac475ad16
wip
2025-05-02 16:57:13 +02:00
9403b563f6
wip
2025-04-22 23:42:41 +02:00
f0de3ad54a
workflow-direct: no panic if no changes
2025-04-17 15:12:51 +02:00
9b5013ee45
git clone lock fixes
2025-04-15 18:15:35 +02:00
8645063e8d
git utils
2025-04-15 13:51:08 +02:00
2d044d5664
git: one generator per app, multiple instances
...
this allows locking for access for each org
2025-04-14 18:33:18 +02:00
ba7686189e
add GitClone for persistent git clones
2025-04-09 00:03:22 +02: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
