{
	"issue": {
		"url": "https://api.github.com/repos/laurent22/joplin/issues/8470",
		"repository_url": "https://api.github.com/repos/laurent22/joplin",
		"labels_url": "https://api.github.com/repos/laurent22/joplin/issues/8470/labels{/name}",
		"comments_url": "https://api.github.com/repos/laurent22/joplin/issues/8470/comments",
		"events_url": "https://api.github.com/repos/laurent22/joplin/issues/8470/events",
		"html_url": "https://github.com/laurent22/joplin/pull/8470",
		"id": 1803507629,
		"node_id": "PR_kwDOBLftOs5Vclxf",
		"number": 8470,
		"title": "Doc: Update conflict.md - how to resolve conflicts",
		"user": {
			"login": "cajhin",
			"id": 4341926,
			"node_id": "MDQ6VXNlcjQzNDE5MjY=",
			"avatar_url": "https://avatars.githubusercontent.com/u/4341926?v=4",
			"gravatar_id": "",
			"url": "https://api.github.com/users/cajhin",
			"html_url": "https://github.com/cajhin",
			"followers_url": "https://api.github.com/users/cajhin/followers",
			"following_url": "https://api.github.com/users/cajhin/following{/other_user}",
			"gists_url": "https://api.github.com/users/cajhin/gists{/gist_id}",
			"starred_url": "https://api.github.com/users/cajhin/starred{/owner}{/repo}",
			"subscriptions_url": "https://api.github.com/users/cajhin/subscriptions",
			"organizations_url": "https://api.github.com/users/cajhin/orgs",
			"repos_url": "https://api.github.com/users/cajhin/repos",
			"events_url": "https://api.github.com/users/cajhin/events{/privacy}",
			"received_events_url": "https://api.github.com/users/cajhin/received_events",
			"type": "User",
			"user_view_type": "public",
			"site_admin": false
		},
		"labels": [],
		"state": "closed",
		"locked": false,
		"assignee": null,
		"assignees": [],
		"milestone": null,
		"comments": 4,
		"created_at": "2023-07-13T17:54:16Z",
		"updated_at": "2023-07-15T10:46:46Z",
		"closed_at": "2023-07-15T10:46:30Z",
		"author_association": "CONTRIBUTOR",
		"sub_issues_summary": {
			"total": 0,
			"completed": 0,
			"percent_completed": 0
		},
		"active_lock_reason": null,
		"draft": false,
		"pull_request": {
			"url": "https://api.github.com/repos/laurent22/joplin/pulls/8470",
			"html_url": "https://github.com/laurent22/joplin/pull/8470",
			"diff_url": "https://github.com/laurent22/joplin/pull/8470.diff",
			"patch_url": "https://github.com/laurent22/joplin/pull/8470.patch",
			"merged_at": "2023-07-15T10:46:30Z"
		},
		"body": "It wasn't described clearly how to proceed in case of a sync conflict.\r\n\r\n<!--\r\n\r\nPlease prefix the title with the platform you are targetting:\r\n\r\nHere are some examples of good titles:\r\n\r\n- Desktop: Resolves #123: Added new setting to change font\r\n- Mobile, Desktop: Fixes #456: Fixed config screen error\r\n- All: Resolves #777: Made synchronisation faster\r\n\r\nAnd here's an explanation of the title format:\r\n\r\n- \"Desktop\" for the Windows/macOS/Linux app (Electron app)\r\n- \"Mobile\" for the mobile app (or \"Android\" / \"iOS\" if the pull request only applies to one of the mobile platforms)\r\n- \"CLI\" for the CLI app\r\n\r\nIf it's two platforms, separate them with commas - \"Desktop, Mobile\" or if it's for all platforms, prefix with \"All\".\r\n\r\nIf it's not related to any platform (such as a translation, change to the documentation, etc.), simply don't add a platform.\r\n\r\nThen please append the issue that you've addressed or fixed. Use \"Resolves #123\" for new features or improvements and \"Fixes #123\" for bug fixes.\r\n\r\nAND PLEASE READ THE GUIDE: https://github.com/laurent22/joplin/blob/dev/CONTRIBUTING.md\r\n\r\n-->\r\n",
		"closed_by": {
			"login": "laurent22",
			"id": 1285584,
			"node_id": "MDQ6VXNlcjEyODU1ODQ=",
			"avatar_url": "https://avatars.githubusercontent.com/u/1285584?v=4",
			"gravatar_id": "",
			"url": "https://api.github.com/users/laurent22",
			"html_url": "https://github.com/laurent22",
			"followers_url": "https://api.github.com/users/laurent22/followers",
			"following_url": "https://api.github.com/users/laurent22/following{/other_user}",
			"gists_url": "https://api.github.com/users/laurent22/gists{/gist_id}",
			"starred_url": "https://api.github.com/users/laurent22/starred{/owner}{/repo}",
			"subscriptions_url": "https://api.github.com/users/laurent22/subscriptions",
			"organizations_url": "https://api.github.com/users/laurent22/orgs",
			"repos_url": "https://api.github.com/users/laurent22/repos",
			"events_url": "https://api.github.com/users/laurent22/events{/privacy}",
			"received_events_url": "https://api.github.com/users/laurent22/received_events",
			"type": "User",
			"user_view_type": "public",
			"site_admin": false
		},
		"reactions": {
			"url": "https://api.github.com/repos/laurent22/joplin/issues/8470/reactions",
			"total_count": 0,
			"+1": 0,
			"-1": 0,
			"laugh": 0,
			"hooray": 0,
			"confused": 0,
			"heart": 0,
			"rocket": 0,
			"eyes": 0
		},
		"timeline_url": "https://api.github.com/repos/laurent22/joplin/issues/8470/timeline",
		"performed_via_github_app": null,
		"state_reason": null
	},
	"comments": [
		{
			"url": "https://api.github.com/repos/laurent22/joplin/issues/comments/1634664205",
			"html_url": "https://github.com/laurent22/joplin/pull/8470#issuecomment-1634664205",
			"issue_url": "https://api.github.com/repos/laurent22/joplin/issues/8470",
			"id": 1634664205,
			"node_id": "IC_kwDOBLftOs5hbv8N",
			"user": {
				"login": "github-actions[bot]",
				"id": 41898282,
				"node_id": "MDM6Qm90NDE4OTgyODI=",
				"avatar_url": "https://avatars.githubusercontent.com/in/15368?v=4",
				"gravatar_id": "",
				"url": "https://api.github.com/users/github-actions%5Bbot%5D",
				"html_url": "https://github.com/apps/github-actions",
				"followers_url": "https://api.github.com/users/github-actions%5Bbot%5D/followers",
				"following_url": "https://api.github.com/users/github-actions%5Bbot%5D/following{/other_user}",
				"gists_url": "https://api.github.com/users/github-actions%5Bbot%5D/gists{/gist_id}",
				"starred_url": "https://api.github.com/users/github-actions%5Bbot%5D/starred{/owner}{/repo}",
				"subscriptions_url": "https://api.github.com/users/github-actions%5Bbot%5D/subscriptions",
				"organizations_url": "https://api.github.com/users/github-actions%5Bbot%5D/orgs",
				"repos_url": "https://api.github.com/users/github-actions%5Bbot%5D/repos",
				"events_url": "https://api.github.com/users/github-actions%5Bbot%5D/events{/privacy}",
				"received_events_url": "https://api.github.com/users/github-actions%5Bbot%5D/received_events",
				"type": "Bot",
				"user_view_type": "public",
				"site_admin": false
			},
			"created_at": "2023-07-13T17:54:31Z",
			"updated_at": "2023-07-15T10:46:46Z",
			"author_association": "CONTRIBUTOR",
			"body": "****CLA Assistant Lite bot**** All contributors have signed the CLA  ✍️ ✅",
			"reactions": {
				"url": "https://api.github.com/repos/laurent22/joplin/issues/comments/1634664205/reactions",
				"total_count": 0,
				"+1": 0,
				"-1": 0,
				"laugh": 0,
				"hooray": 0,
				"confused": 0,
				"heart": 0,
				"rocket": 0,
				"eyes": 0
			},
			"performed_via_github_app": null
		},
		{
			"url": "https://api.github.com/repos/laurent22/joplin/issues/comments/1634665621",
			"html_url": "https://github.com/laurent22/joplin/pull/8470#issuecomment-1634665621",
			"issue_url": "https://api.github.com/repos/laurent22/joplin/issues/8470",
			"id": 1634665621,
			"node_id": "IC_kwDOBLftOs5hbwSV",
			"user": {
				"login": "cajhin",
				"id": 4341926,
				"node_id": "MDQ6VXNlcjQzNDE5MjY=",
				"avatar_url": "https://avatars.githubusercontent.com/u/4341926?v=4",
				"gravatar_id": "",
				"url": "https://api.github.com/users/cajhin",
				"html_url": "https://github.com/cajhin",
				"followers_url": "https://api.github.com/users/cajhin/followers",
				"following_url": "https://api.github.com/users/cajhin/following{/other_user}",
				"gists_url": "https://api.github.com/users/cajhin/gists{/gist_id}",
				"starred_url": "https://api.github.com/users/cajhin/starred{/owner}{/repo}",
				"subscriptions_url": "https://api.github.com/users/cajhin/subscriptions",
				"organizations_url": "https://api.github.com/users/cajhin/orgs",
				"repos_url": "https://api.github.com/users/cajhin/repos",
				"events_url": "https://api.github.com/users/cajhin/events{/privacy}",
				"received_events_url": "https://api.github.com/users/cajhin/received_events",
				"type": "User",
				"user_view_type": "public",
				"site_admin": false
			},
			"created_at": "2023-07-13T17:55:24Z",
			"updated_at": "2023-07-13T17:55:24Z",
			"author_association": "CONTRIBUTOR",
			"body": "I have read the CLA Document and I hereby sign the CLA",
			"reactions": {
				"url": "https://api.github.com/repos/laurent22/joplin/issues/comments/1634665621/reactions",
				"total_count": 0,
				"+1": 0,
				"-1": 0,
				"laugh": 0,
				"hooray": 0,
				"confused": 0,
				"heart": 0,
				"rocket": 0,
				"eyes": 0
			},
			"performed_via_github_app": null
		},
		{
			"url": "https://api.github.com/repos/laurent22/joplin/issues/comments/1634721164",
			"html_url": "https://github.com/laurent22/joplin/pull/8470#issuecomment-1634721164",
			"issue_url": "https://api.github.com/repos/laurent22/joplin/issues/8470",
			"id": 1634721164,
			"node_id": "IC_kwDOBLftOs5hb92M",
			"user": {
				"login": "Daeraxa",
				"id": 58074586,
				"node_id": "MDQ6VXNlcjU4MDc0NTg2",
				"avatar_url": "https://avatars.githubusercontent.com/u/58074586?v=4",
				"gravatar_id": "",
				"url": "https://api.github.com/users/Daeraxa",
				"html_url": "https://github.com/Daeraxa",
				"followers_url": "https://api.github.com/users/Daeraxa/followers",
				"following_url": "https://api.github.com/users/Daeraxa/following{/other_user}",
				"gists_url": "https://api.github.com/users/Daeraxa/gists{/gist_id}",
				"starred_url": "https://api.github.com/users/Daeraxa/starred{/owner}{/repo}",
				"subscriptions_url": "https://api.github.com/users/Daeraxa/subscriptions",
				"organizations_url": "https://api.github.com/users/Daeraxa/orgs",
				"repos_url": "https://api.github.com/users/Daeraxa/repos",
				"events_url": "https://api.github.com/users/Daeraxa/events{/privacy}",
				"received_events_url": "https://api.github.com/users/Daeraxa/received_events",
				"type": "User",
				"user_view_type": "public",
				"site_admin": false
			},
			"created_at": "2023-07-13T18:40:53Z",
			"updated_at": "2023-07-13T18:41:17Z",
			"author_association": "CONTRIBUTOR",
			"body": "The documentation and project uses BRE spelling so instances of `synchronized` need to be changed to (and in some cases changed back to) `synchronised`.",
			"reactions": {
				"url": "https://api.github.com/repos/laurent22/joplin/issues/comments/1634721164/reactions",
				"total_count": 0,
				"+1": 0,
				"-1": 0,
				"laugh": 0,
				"hooray": 0,
				"confused": 0,
				"heart": 0,
				"rocket": 0,
				"eyes": 0
			},
			"performed_via_github_app": null
		},
		{
			"url": "https://api.github.com/repos/laurent22/joplin/issues/comments/1636733682",
			"html_url": "https://github.com/laurent22/joplin/pull/8470#issuecomment-1636733682",
			"issue_url": "https://api.github.com/repos/laurent22/joplin/issues/8470",
			"id": 1636733682,
			"node_id": "IC_kwDOBLftOs5hjpLy",
			"user": {
				"login": "laurent22",
				"id": 1285584,
				"node_id": "MDQ6VXNlcjEyODU1ODQ=",
				"avatar_url": "https://avatars.githubusercontent.com/u/1285584?v=4",
				"gravatar_id": "",
				"url": "https://api.github.com/users/laurent22",
				"html_url": "https://github.com/laurent22",
				"followers_url": "https://api.github.com/users/laurent22/followers",
				"following_url": "https://api.github.com/users/laurent22/following{/other_user}",
				"gists_url": "https://api.github.com/users/laurent22/gists{/gist_id}",
				"starred_url": "https://api.github.com/users/laurent22/starred{/owner}{/repo}",
				"subscriptions_url": "https://api.github.com/users/laurent22/subscriptions",
				"organizations_url": "https://api.github.com/users/laurent22/orgs",
				"repos_url": "https://api.github.com/users/laurent22/repos",
				"events_url": "https://api.github.com/users/laurent22/events{/privacy}",
				"received_events_url": "https://api.github.com/users/laurent22/received_events",
				"type": "User",
				"user_view_type": "public",
				"site_admin": false
			},
			"created_at": "2023-07-15T10:46:24Z",
			"updated_at": "2023-07-15T10:46:24Z",
			"author_association": "OWNER",
			"body": "Looks good to me, thanks for adding this!",
			"reactions": {
				"url": "https://api.github.com/repos/laurent22/joplin/issues/comments/1636733682/reactions",
				"total_count": 0,
				"+1": 0,
				"-1": 0,
				"laugh": 0,
				"hooray": 0,
				"confused": 0,
				"heart": 0,
				"rocket": 0,
				"eyes": 0
			},
			"performed_via_github_app": null
		}
	]
}