{"action":"created","comment":{"url":"https://api.github.com/repos/django/django/pulls/comments/25995011","id":25995011,"diff_hunk":"@@ -234,7 +234,14 @@ def handle_merge(self, loader, conflicts):\n                 })\n                 new_migration = subclass(\"%04i_merge\" % (biggest_number + 1), app_label)\n                 writer = MigrationWriter(new_migration)\n-                with open(writer.path, \"wb\") as fh:\n-                    fh.write(writer.as_string())\n-                if self.verbosity > 0:\n-                    self.stdout.write(\"\\nCreated new merge migration %s\" % writer.path)\n+\n+                if not self.dry_run:\n+                    with open(writer.path, \"wb\") as fh:\n+                        fh.write(writer.as_string())\n+                    if self.verbosity > 0:\n+                        self.stdout.write(\"\\nCreated new merge migration %s\" % writer.path)\n+                elif self.verbosity == 3:\n+                    self.stdout.write(self.style.MIGRATE_HEADING(\n+                        \"Full merge migration file '%s':\" % writer.filename) + \"\\n\"","path":"django/core/management/commands/makemigrations.py","position":16,"original_position":16,"commit_id":"f274134e875b1555126c605b18b971fe3c716088","original_commit_id":"f274134e875b1555126c605b18b971fe3c716088","user":{"login":"MarkusH","id":475613,"avatar_url":"https://avatars.githubusercontent.com/u/475613?v=3","gravatar_id":"","url":"https://api.github.com/users/MarkusH","html_url":"https://github.com/MarkusH","followers_url":"https://api.github.com/users/MarkusH/followers","following_url":"https://api.github.com/users/MarkusH/following{/other_user}","gists_url":"https://api.github.com/users/MarkusH/gists{/gist_id}","starred_url":"https://api.github.com/users/MarkusH/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/MarkusH/subscriptions","organizations_url":"https://api.github.com/users/MarkusH/orgs","repos_url":"https://api.github.com/users/MarkusH/repos","events_url":"https://api.github.com/users/MarkusH/events{/privacy}","received_events_url":"https://api.github.com/users/MarkusH/received_events","type":"User","site_admin":false},"body":"\"migration***s***\"","created_at":"2015-03-07T10:10:06Z","updated_at":"2015-03-07T10:10:06Z","html_url":"https://github.com/django/django/pull/4252#discussion_r25995011","pull_request_url":"https://api.github.com/repos/django/django/pulls/4252","_links":{"self":{"href":"https://api.github.com/repos/django/django/pulls/comments/25995011"},"html":{"href":"https://github.com/django/django/pull/4252#discussion_r25995011"},"pull_request":{"href":"https://api.github.com/repos/django/django/pulls/4252"}}},"pull_request":{"url":"https://api.github.com/repos/django/django/pulls/4252","id":30644616,"html_url":"https://github.com/django/django/pull/4252","diff_url":"https://github.com/django/django/pull/4252.diff","patch_url":"https://github.com/django/django/pull/4252.patch","issue_url":"https://api.github.com/repos/django/django/issues/4252","number":4252,"state":"open","locked":false,"title":"Respect --dry-run option when fixing migration conflicts.","user":{"login":"johngian","id":835321,"avatar_url":"https://avatars.githubusercontent.com/u/835321?v=3","gravatar_id":"","url":"https://api.github.com/users/johngian","html_url":"https://github.com/johngian","followers_url":"https://api.github.com/users/johngian/followers","following_url":"https://api.github.com/users/johngian/following{/other_user}","gists_url":"https://api.github.com/users/johngian/gists{/gist_id}","starred_url":"https://api.github.com/users/johngian/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/johngian/subscriptions","organizations_url":"https://api.github.com/users/johngian/orgs","repos_url":"https://api.github.com/users/johngian/repos","events_url":"https://api.github.com/users/johngian/events{/privacy}","received_events_url":"https://api.github.com/users/johngian/received_events","type":"User","site_admin":false},"body":"* Avoid writing migration to file when dry_run=True\r\n* Write migration to stdout when verbosity=3\r\n\r\nhttps://code.djangoproject.com/ticket/24427","created_at":"2015-03-06T13:32:40Z","updated_at":"2015-03-07T10:10:06Z","closed_at":null,"merged_at":null,"merge_commit_sha":"cd4e7aa2f3b51eb9fcff740538bbd6cea4f308f6","assignee":null,"milestone":null,"commits_url":"https://api.github.com/repos/django/django/pulls/4252/commits","review_comments_url":"https://api.github.com/repos/django/django/pulls/4252/comments","review_comment_url":"https://api.github.com/repos/django/django/pulls/comments{/number}","comments_url":"https://api.github.com/repos/django/django/issues/4252/comments","statuses_url":"https://api.github.com/repos/django/django/statuses/f274134e875b1555126c605b18b971fe3c716088","head":{"label":"johngian:ticket_24427","ref":"ticket_24427","sha":"f274134e875b1555126c605b18b971fe3c716088","user":{"login":"johngian","id":835321,"avatar_url":"https://avatars.githubusercontent.com/u/835321?v=3","gravatar_id":"","url":"https://api.github.com/users/johngian","html_url":"https://github.com/johngian","followers_url":"https://api.github.com/users/johngian/followers","following_url":"https://api.github.com/users/johngian/following{/other_user}","gists_url":"https://api.github.com/users/johngian/gists{/gist_id}","starred_url":"https://api.github.com/users/johngian/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/johngian/subscriptions","organizations_url":"https://api.github.com/users/johngian/orgs","repos_url":"https://api.github.com/users/johngian/repos","events_url":"https://api.github.com/users/johngian/events{/privacy}","received_events_url":"https://api.github.com/users/johngian/received_events","type":"User","site_admin":false},"repo":{"id":31514323,"name":"django","full_name":"johngian/django","owner":{"login":"johngian","id":835321,"avatar_url":"https://avatars.githubusercontent.com/u/835321?v=3","gravatar_id":"","url":"https://api.github.com/users/johngian","html_url":"https://github.com/johngian","followers_url":"https://api.github.com/users/johngian/followers","following_url":"https://api.github.com/users/johngian/following{/other_user}","gists_url":"https://api.github.com/users/johngian/gists{/gist_id}","starred_url":"https://api.github.com/users/johngian/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/johngian/subscriptions","organizations_url":"https://api.github.com/users/johngian/orgs","repos_url":"https://api.github.com/users/johngian/repos","events_url":"https://api.github.com/users/johngian/events{/privacy}","received_events_url":"https://api.github.com/users/johngian/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/johngian/django","description":"The Web framework for perfectionists with deadlines.","fork":true,"url":"https://api.github.com/repos/johngian/django","forks_url":"https://api.github.com/repos/johngian/django/forks","keys_url":"https://api.github.com/repos/johngian/django/keys{/key_id}","collaborators_url":"https://api.github.com/repos/johngian/django/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/johngian/django/teams","hooks_url":"https://api.github.com/repos/johngian/django/hooks","issue_events_url":"https://api.github.com/repos/johngian/django/issues/events{/number}","events_url":"https://api.github.com/repos/johngian/django/events","assignees_url":"https://api.github.com/repos/johngian/django/assignees{/user}","branches_url":"https://api.github.com/repos/johngian/django/branches{/branch}","tags_url":"https://api.github.com/repos/johngian/django/tags","blobs_url":"https://api.github.com/repos/johngian/django/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/johngian/django/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/johngian/django/git/refs{/sha}","trees_url":"https://api.github.com/repos/johngian/django/git/trees{/sha}","statuses_url":"https://api.github.com/repos/johngian/django/statuses/{sha}","languages_url":"https://api.github.com/repos/johngian/django/languages","stargazers_url":"https://api.github.com/repos/johngian/django/stargazers","contributors_url":"https://api.github.com/repos/johngian/django/contributors","subscribers_url":"https://api.github.com/repos/johngian/django/subscribers","subscription_url":"https://api.github.com/repos/johngian/django/subscription","commits_url":"https://api.github.com/repos/johngian/django/commits{/sha}","git_commits_url":"https://api.github.com/repos/johngian/django/git/commits{/sha}","comments_url":"https://api.github.com/repos/johngian/django/comments{/number}","issue_comment_url":"https://api.github.com/repos/johngian/django/issues/comments{/number}","contents_url":"https://api.github.com/repos/johngian/django/contents/{+path}","compare_url":"https://api.github.com/repos/johngian/django/compare/{base}...{head}","merges_url":"https://api.github.com/repos/johngian/django/merges","archive_url":"https://api.github.com/repos/johngian/django/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/johngian/django/downloads","issues_url":"https://api.github.com/repos/johngian/django/issues{/number}","pulls_url":"https://api.github.com/repos/johngian/django/pulls{/number}","milestones_url":"https://api.github.com/repos/johngian/django/milestones{/number}","notifications_url":"https://api.github.com/repos/johngian/django/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/johngian/django/labels{/name}","releases_url":"https://api.github.com/repos/johngian/django/releases{/id}","created_at":"2015-03-01T22:59:41Z","updated_at":"2015-03-01T22:59:57Z","pushed_at":"2015-03-02T23:21:40Z","git_url":"git://github.com/johngian/django.git","ssh_url":"git@github.com:johngian/django.git","clone_url":"https://github.com/johngian/django.git","svn_url":"https://github.com/johngian/django","homepage":"https://www.djangoproject.com/","size":124264,"stargazers_count":0,"watchers_count":0,"language":"Python","has_issues":false,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":0,"mirror_url":null,"open_issues_count":0,"forks":0,"open_issues":0,"watchers":0,"default_branch":"master"}},"base":{"label":"django:master","ref":"master","sha":"ceaf31adfff3801f1092a215f73704e15a70e90c","user":{"login":"django","id":27804,"avatar_url":"https://avatars.githubusercontent.com/u/27804?v=3","gravatar_id":"","url":"https://api.github.com/users/django","html_url":"https://github.com/django","followers_url":"https://api.github.com/users/django/followers","following_url":"https://api.github.com/users/django/following{/other_user}","gists_url":"https://api.github.com/users/django/gists{/gist_id}","starred_url":"https://api.github.com/users/django/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/django/subscriptions","organizations_url":"https://api.github.com/users/django/orgs","repos_url":"https://api.github.com/users/django/repos","events_url":"https://api.github.com/users/django/events{/privacy}","received_events_url":"https://api.github.com/users/django/received_events","type":"Organization","site_admin":false},"repo":{"id":4164482,"name":"django","full_name":"django/django","owner":{"login":"django","id":27804,"avatar_url":"https://avatars.githubusercontent.com/u/27804?v=3","gravatar_id":"","url":"https://api.github.com/users/django","html_url":"https://github.com/django","followers_url":"https://api.github.com/users/django/followers","following_url":"https://api.github.com/users/django/following{/other_user}","gists_url":"https://api.github.com/users/django/gists{/gist_id}","starred_url":"https://api.github.com/users/django/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/django/subscriptions","organizations_url":"https://api.github.com/users/django/orgs","repos_url":"https://api.github.com/users/django/repos","events_url":"https://api.github.com/users/django/events{/privacy}","received_events_url":"https://api.github.com/users/django/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/django/django","description":"The Web framework for perfectionists with deadlines.","fork":false,"url":"https://api.github.com/repos/django/django","forks_url":"https://api.github.com/repos/django/django/forks","keys_url":"https://api.github.com/repos/django/django/keys{/key_id}","collaborators_url":"https://api.github.com/repos/django/django/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/django/django/teams","hooks_url":"https://api.github.com/repos/django/django/hooks","issue_events_url":"https://api.github.com/repos/django/django/issues/events{/number}","events_url":"https://api.github.com/repos/django/django/events","assignees_url":"https://api.github.com/repos/django/django/assignees{/user}","branches_url":"https://api.github.com/repos/django/django/branches{/branch}","tags_url":"https://api.github.com/repos/django/django/tags","blobs_url":"https://api.github.com/repos/django/django/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/django/django/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/django/django/git/refs{/sha}","trees_url":"https://api.github.com/repos/django/django/git/trees{/sha}","statuses_url":"https://api.github.com/repos/django/django/statuses/{sha}","languages_url":"https://api.github.com/repos/django/django/languages","stargazers_url":"https://api.github.com/repos/django/django/stargazers","contributors_url":"https://api.github.com/repos/django/django/contributors","subscribers_url":"https://api.github.com/repos/django/django/subscribers","subscription_url":"https://api.github.com/repos/django/django/subscription","commits_url":"https://api.github.com/repos/django/django/commits{/sha}","git_commits_url":"https://api.github.com/repos/django/django/git/commits{/sha}","comments_url":"https://api.github.com/repos/django/django/comments{/number}","issue_comment_url":"https://api.github.com/repos/django/django/issues/comments{/number}","contents_url":"https://api.github.com/repos/django/django/contents/{+path}","compare_url":"https://api.github.com/repos/django/django/compare/{base}...{head}","merges_url":"https://api.github.com/repos/django/django/merges","archive_url":"https://api.github.com/repos/django/django/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/django/django/downloads","issues_url":"https://api.github.com/repos/django/django/issues{/number}","pulls_url":"https://api.github.com/repos/django/django/pulls{/number}","milestones_url":"https://api.github.com/repos/django/django/milestones{/number}","notifications_url":"https://api.github.com/repos/django/django/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/django/django/labels{/name}","releases_url":"https://api.github.com/repos/django/django/releases{/id}","created_at":"2012-04-28T02:47:18Z","updated_at":"2015-03-07T08:57:02Z","pushed_at":"2015-03-06T21:23:22Z","git_url":"git://github.com/django/django.git","ssh_url":"git@github.com:django/django.git","clone_url":"https://github.com/django/django.git","svn_url":"https://github.com/django/django","homepage":"https://www.djangoproject.com/","size":264320,"stargazers_count":13173,"watchers_count":13173,"language":"Python","has_issues":false,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":5153,"mirror_url":null,"open_issues_count":94,"forks":5153,"open_issues":94,"watchers":13173,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/django/django/pulls/4252"},"html":{"href":"https://github.com/django/django/pull/4252"},"issue":{"href":"https://api.github.com/repos/django/django/issues/4252"},"comments":{"href":"https://api.github.com/repos/django/django/issues/4252/comments"},"review_comments":{"href":"https://api.github.com/repos/django/django/pulls/4252/comments"},"review_comment":{"href":"https://api.github.com/repos/django/django/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/django/django/pulls/4252/commits"},"statuses":{"href":"https://api.github.com/repos/django/django/statuses/f274134e875b1555126c605b18b971fe3c716088"}}}}