{"unit":null,"component":"https://weblate.foundryvtt-hub.com/api/components/bullseye-ng/main/?format=json","translation":null,"user":"https://weblate.foundryvtt-hub.com/api/users/DrMcCoy/?format=json","author":null,"timestamp":"2023-02-18T15:12:16.476245Z","action":22,"target":"Auto-merging README.md\nCONFLICT (content): Merge conflict in README.md\nAutomatic merge failed; fix conflicts and then commit the result.\n (1)","old":"","details":{"error":"Auto-merging README.md\nCONFLICT (content): Merge conflict in README.md\nAutomatic merge failed; fix conflicts and then commit the result.\n (1)","status":"On branch main\nYour branch and 'origin/main' have diverged,\nand have 2 and 1 different commits each, respectively.\n  (use \"git pull\" to merge the remote branch into yours)\n\nYou have unmerged paths.\n  (fix conflicts and run \"git commit\")\n  (use \"git merge --abort\" to abort the merge)\n\nUnmerged paths:\n  (use \"git add <file>...\" to mark resolution)\n\tboth modified:   README.md\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n"},"id":245483,"action_name":"Repository merge failed","url":"https://weblate.foundryvtt-hub.com/api/changes/245483/?format=json"}