This repository has no description
0

Configure Feed

Select the types of activity you want to include in your feed.

core / lexicons / repo / mergeCheck.json
2.4 kB 84 lines
1{ 2 "lexicon": 1, 3 "id": "sh.tangled.repo.mergeCheck", 4 "defs": { 5 "main": { 6 "type": "procedure", 7 "description": "Check if a merge is possible between two branches", 8 "input": { 9 "encoding": "application/json", 10 "schema": { 11 "type": "object", 12 "required": ["did", "name", "patch", "branch"], 13 "properties": { 14 "did": { 15 "type": "string", 16 "format": "did", 17 "description": "DID of the repository owner" 18 }, 19 "name": { 20 "type": "string", 21 "description": "Name of the repository" 22 }, 23 "repo": { 24 "type": "string", 25 "format": "did", 26 "description": "DID of the repository" 27 }, 28 "patch": { 29 "type": "string", 30 "description": "Patch or pull request to check for merge conflicts" 31 }, 32 "branch": { 33 "type": "string", 34 "description": "Target branch to merge into" 35 } 36 } 37 } 38 }, 39 "output": { 40 "encoding": "application/json", 41 "schema": { 42 "type": "object", 43 "required": ["is_conflicted"], 44 "properties": { 45 "is_conflicted": { 46 "type": "boolean", 47 "description": "Whether the merge has conflicts" 48 }, 49 "conflicts": { 50 "type": "array", 51 "description": "List of files with merge conflicts", 52 "items": { 53 "type": "ref", 54 "ref": "#conflictInfo" 55 } 56 }, 57 "message": { 58 "type": "string", 59 "description": "Additional message about the merge check" 60 }, 61 "error": { 62 "type": "string", 63 "description": "Error message if check failed" 64 } 65 } 66 } 67 } 68 }, 69 "conflictInfo": { 70 "type": "object", 71 "required": ["filename", "reason"], 72 "properties": { 73 "filename": { 74 "type": "string", 75 "description": "Name of the conflicted file" 76 }, 77 "reason": { 78 "type": "string", 79 "description": "Reason for the conflict" 80 } 81 } 82 } 83 } 84}