{"id":20942409,"url":"https://github.com/unfoldingword-dev/dcs-api-resolve-conflicts-poc","last_synced_at":"2026-04-20T20:04:23.787Z","repository":{"id":141873849,"uuid":"312623689","full_name":"unfoldingWord-dev/dcs-api-resolve-conflicts-poc","owner":"unfoldingWord-dev","description":null,"archived":false,"fork":false,"pushed_at":"2020-11-13T22:23:24.000Z","size":6,"stargazers_count":0,"open_issues_count":0,"forks_count":0,"subscribers_count":4,"default_branch":"master","last_synced_at":"2025-01-19T21:16:09.826Z","etag":null,"topics":[],"latest_commit_sha":null,"homepage":null,"language":"Shell","has_issues":true,"has_wiki":null,"has_pages":null,"mirror_url":null,"source_name":null,"license":null,"status":null,"scm":"git","pull_requests_enabled":true,"icon_url":"https://github.com/unfoldingWord-dev.png","metadata":{"files":{"readme":"README.md","changelog":null,"contributing":null,"funding":null,"license":null,"code_of_conduct":null,"threat_model":null,"audit":null,"citation":null,"codeowners":null,"security":null,"support":null,"governance":null,"roadmap":null,"authors":null,"dei":null,"publiccode":null,"codemeta":null}},"created_at":"2020-11-13T16:11:40.000Z","updated_at":"2020-11-13T22:23:27.000Z","dependencies_parsed_at":"2024-04-19T07:48:08.052Z","dependency_job_id":null,"html_url":"https://github.com/unfoldingWord-dev/dcs-api-resolve-conflicts-poc","commit_stats":null,"previous_names":[],"tags_count":0,"template":false,"template_full_name":null,"repository_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/unfoldingWord-dev%2Fdcs-api-resolve-conflicts-poc","tags_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/unfoldingWord-dev%2Fdcs-api-resolve-conflicts-poc/tags","releases_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/unfoldingWord-dev%2Fdcs-api-resolve-conflicts-poc/releases","manifests_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/unfoldingWord-dev%2Fdcs-api-resolve-conflicts-poc/manifests","owner_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/owners/unfoldingWord-dev","download_url":"https://codeload.github.com/unfoldingWord-dev/dcs-api-resolve-conflicts-poc/tar.gz/refs/heads/master","host":{"name":"GitHub","url":"https://github.com","kind":"github","repositories_count":243335382,"owners_count":20274898,"icon_url":"https://github.com/github.png","version":null,"created_at":"2022-05-30T11:31:42.601Z","updated_at":"2022-07-04T15:15:14.044Z","host_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub","repositories_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories","repository_names_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repository_names","owners_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/owners"}},"keywords":[],"created_at":"2024-11-18T23:26:50.016Z","updated_at":"2025-12-25T20:58:33.607Z","avatar_url":"https://github.com/unfoldingWord-dev.png","language":"Shell","funding_links":[],"categories":[],"sub_categories":[],"readme":"# Proof of Concept for using DCS API to merge branches\n\nThis is a proof of concept for showing a repo can be set up, a master branch initialized with files, a user branch made, and then changes are made to both branches, and then the user branch can be merged into master, all using the DCS/Gitea API.\n\nGitHube Repo for POC scripts/files: https://www.github.com/unfoldingword-dev/dcs-api-merge-poc\n\nRunnable copy can be found here: https://repl.it/@richmahn/dcs-api-merge-poc\n\nResulting repo is at: https://qa.door43.org/dcs-poc-org/dcs-poc-repo\n\n","project_url":"https://awesome.ecosyste.ms/api/v1/projects/github.com%2Funfoldingword-dev%2Fdcs-api-resolve-conflicts-poc","html_url":"https://awesome.ecosyste.ms/projects/github.com%2Funfoldingword-dev%2Fdcs-api-resolve-conflicts-poc","lists_url":"https://awesome.ecosyste.ms/api/v1/projects/github.com%2Funfoldingword-dev%2Fdcs-api-resolve-conflicts-poc/lists"}