summaryrefslogtreecommitdiff
path: root/python/collaboration/merge.py
AgeCommit message (Expand)Author
2026-04-15[Python API] Replace bare "except:" with "except Exception:" to fix signal pr...Josh Ferrell
2024-09-25Fix python merge conflict handlersJosh Ferrell
2024-08-07Expose Collaboration::ConflictSplitter in APIJosh Ferrell
2024-05-13Move collaboration to coreJosh Ferrell