{"action":"created","issue":{"url":"https://api.github.com/repos/gentoo/gentoo/issues/8811","repository_url":"https://api.github.com/repos/gentoo/gentoo","labels_url":"https://api.github.com/repos/gentoo/gentoo/issues/8811/labels{/name}","comments_url":"https://api.github.com/repos/gentoo/gentoo/issues/8811/comments","events_url":"https://api.github.com/repos/gentoo/gentoo/issues/8811/events","html_url":"https://github.com/gentoo/gentoo/pull/8811","id":331516253,"node_id":"MDExOlB1bGxSZXF1ZXN0MTk0MjI0NTI1","number":8811,"title":" www-apps/nextcloud-13.0.4 version bump","user":{"login":"stefangweichinger","id":2673904,"node_id":"MDQ6VXNlcjI2NzM5MDQ=","avatar_url":"https://avatars0.githubusercontent.com/u/2673904?v=4","gravatar_id":"","url":"https://api.github.com/users/stefangweichinger","html_url":"https://github.com/stefangweichinger","followers_url":"https://api.github.com/users/stefangweichinger/followers","following_url":"https://api.github.com/users/stefangweichinger/following{/other_user}","gists_url":"https://api.github.com/users/stefangweichinger/gists{/gist_id}","starred_url":"https://api.github.com/users/stefangweichinger/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/stefangweichinger/subscriptions","organizations_url":"https://api.github.com/users/stefangweichinger/orgs","repos_url":"https://api.github.com/users/stefangweichinger/repos","events_url":"https://api.github.com/users/stefangweichinger/events{/privacy}","received_events_url":"https://api.github.com/users/stefangweichinger/received_events","type":"User","site_admin":false},"labels":[{"id":257560845,"node_id":"MDU6TGFiZWwyNTc1NjA4NDU=","url":"https://api.github.com/repos/gentoo/gentoo/labels/assigned","name":"assigned","color":"5319e7","default":false},{"id":740393777,"node_id":"MDU6TGFiZWw3NDAzOTM3Nzc=","url":"https://api.github.com/repos/gentoo/gentoo/labels/bug%20linked","name":"bug linked","color":"f767dd","default":false}],"state":"open","locked":false,"assignee":null,"assignees":[],"milestone":null,"comments":9,"created_at":"2018-06-12T09:49:54Z","updated_at":"2018-06-13T17:12:00Z","closed_at":null,"author_association":"CONTRIBUTOR","pull_request":{"url":"https://api.github.com/repos/gentoo/gentoo/pulls/8811","html_url":"https://github.com/gentoo/gentoo/pull/8811","diff_url":"https://github.com/gentoo/gentoo/pull/8811.diff","patch_url":"https://github.com/gentoo/gentoo/pull/8811.patch"},"body":"Bug: https://bugs.gentoo.org/657810"},"comment":{"url":"https://api.github.com/repos/gentoo/gentoo/issues/comments/397015217","html_url":"https://github.com/gentoo/gentoo/pull/8811#issuecomment-397015217","issue_url":"https://api.github.com/repos/gentoo/gentoo/issues/8811","id":397015217,"node_id":"MDEyOklzc3VlQ29tbWVudDM5NzAxNTIxNw==","user":{"login":"gyakovlev","id":168902,"node_id":"MDQ6VXNlcjE2ODkwMg==","avatar_url":"https://avatars1.githubusercontent.com/u/168902?v=4","gravatar_id":"","url":"https://api.github.com/users/gyakovlev","html_url":"https://github.com/gyakovlev","followers_url":"https://api.github.com/users/gyakovlev/followers","following_url":"https://api.github.com/users/gyakovlev/following{/other_user}","gists_url":"https://api.github.com/users/gyakovlev/gists{/gist_id}","starred_url":"https://api.github.com/users/gyakovlev/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/gyakovlev/subscriptions","organizations_url":"https://api.github.com/users/gyakovlev/orgs","repos_url":"https://api.github.com/users/gyakovlev/repos","events_url":"https://api.github.com/users/gyakovlev/events{/privacy}","received_events_url":"https://api.github.com/users/gyakovlev/received_events","type":"User","site_admin":false},"created_at":"2018-06-13T17:12:00Z","updated_at":"2018-06-13T17:12:00Z","author_association":"CONTRIBUTOR","body":"so from current state you can do:\r\n* edit Manifest,\r\n  remove all lines with starting with `<<<<<<< HEAD` line\r\n\r\n* run `repoman manifest` so it generates a new one\r\n* run `repoman -dx commit`\r\n  put any commit message this time, we'll discard at next step\r\n\r\nafter you commit it run:\r\n\r\n* `git rebase -i HEAD~2` don't worry, it should not touch anything extra this time\r\n  place `f` or `fixup` in front of that commit you just made that fixes manifest\r\n\r\nnow you just combined (squashed) 2 commits into single one.\r\n\r\nforce-push again, should be fine. \r\n"}}
{"actor":{"display_login":"gyakovlev"}}