{"action":"created","comment":{"url":"https://api.github.com/repos/Originate/git-town/pulls/comments/27184877","id":27184877,"diff_hunk":"@@ -0,0 +1,85 @@\n+Feature: git extract: resolving conflicts between main branch and extracted commits (without open changes or remote repo)\n+\n+  (see ../with_remote_origin/with_open_changes.feature)\n+\n+\n+  Background:\n+    Given I have a feature branch named \"feature\"\n+    And my repo does not have a remote origin\n+    And the following commits exist in my repository\n+      | BRANCH  | LOCATION | MESSAGE         | FILE NAME        | FILE CONTENT     |\n+      | main    | local    | main commit     | conflicting_file | main content     |\n+      | feature | local    | feature commit  | feature_file     |                  |\n+      |         |          | refactor commit | conflicting_file | refactor content |\n+    And I am on the \"feature\" branch\n+    When I run `git extract refactor` with the last commit sha\n+\n+\n+  Scenario: result\n+    Then it runs the Git commands\n+      | BRANCH   | COMMAND                                      |\n+      | feature  | git checkout main                            |\n+      | main     | git checkout -b refactor main                |\n+      | refactor | git cherry-pick <%= sha 'refactor commit' %> |\n+    And I get the error\n+      \"\"\"\n+      To abort, run \"git extract --abort\".\n+      To continue after you have resolved the conflicts, run \"git extract --continue\".\n+      \"\"\"\n+    And I end up on the \"refactor\" branch\n+    And my repo has a cherry-pick in progress\n+\n+\n+  Scenario: aborting\n+    When I run `git extract --abort`\n+    Then it runs the Git commands\n+      | BRANCH   | COMMAND                 |\n+      | refactor | git cherry-pick --abort |\n+      | refactor | git checkout main       |\n+      | main     | git branch -d refactor  |\n+      | main     | git checkout feature    |\n+    And I end up on the \"feature\" branch\n+    And there is no \"refactor\" branch\n+    And I have the following commits","path":"features/git-extract/cherry_pick_conflict/without_remote_origin/without_open_changes.feature","position":43,"original_position":43,"commit_id":"e5d67fede924010b61071d78d7e4baaa25c84a40","original_commit_id":"e5d67fede924010b61071d78d7e4baaa25c84a40","user":{"login":"kevgo","id":268934,"avatar_url":"https://avatars.githubusercontent.com/u/268934?v=3","gravatar_id":"","url":"https://api.github.com/users/kevgo","html_url":"https://github.com/kevgo","followers_url":"https://api.github.com/users/kevgo/followers","following_url":"https://api.github.com/users/kevgo/following{/other_user}","gists_url":"https://api.github.com/users/kevgo/gists{/gist_id}","starred_url":"https://api.github.com/users/kevgo/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/kevgo/subscriptions","organizations_url":"https://api.github.com/users/kevgo/orgs","repos_url":"https://api.github.com/users/kevgo/repos","events_url":"https://api.github.com/users/kevgo/events{/privacy}","received_events_url":"https://api.github.com/users/kevgo/received_events","type":"User","site_admin":false},"body":"Use `And I am left with my original commits` here as well","created_at":"2015-03-26T02:39:28Z","updated_at":"2015-03-26T02:39:28Z","html_url":"https://github.com/Originate/git-town/pull/448#discussion_r27184877","pull_request_url":"https://api.github.com/repos/Originate/git-town/pulls/448","_links":{"self":{"href":"https://api.github.com/repos/Originate/git-town/pulls/comments/27184877"},"html":{"href":"https://github.com/Originate/git-town/pull/448#discussion_r27184877"},"pull_request":{"href":"https://api.github.com/repos/Originate/git-town/pulls/448"}}},"pull_request":{"url":"https://api.github.com/repos/Originate/git-town/pulls/448","id":31891601,"html_url":"https://github.com/Originate/git-town/pull/448","diff_url":"https://github.com/Originate/git-town/pull/448.diff","patch_url":"https://github.com/Originate/git-town/pull/448.patch","issue_url":"https://api.github.com/repos/Originate/git-town/issues/448","number":448,"state":"open","locked":false,"title":"Support git-extract without remote repo","user":{"login":"ricmatsui","id":5288285,"avatar_url":"https://avatars.githubusercontent.com/u/5288285?v=3","gravatar_id":"","url":"https://api.github.com/users/ricmatsui","html_url":"https://github.com/ricmatsui","followers_url":"https://api.github.com/users/ricmatsui/followers","following_url":"https://api.github.com/users/ricmatsui/following{/other_user}","gists_url":"https://api.github.com/users/ricmatsui/gists{/gist_id}","starred_url":"https://api.github.com/users/ricmatsui/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/ricmatsui/subscriptions","organizations_url":"https://api.github.com/users/ricmatsui/orgs","repos_url":"https://api.github.com/users/ricmatsui/repos","events_url":"https://api.github.com/users/ricmatsui/events{/privacy}","received_events_url":"https://api.github.com/users/ricmatsui/received_events","type":"User","site_admin":false},"body":"Including echo if true helper and global has remote","created_at":"2015-03-25T03:56:38Z","updated_at":"2015-03-26T02:39:28Z","closed_at":null,"merged_at":null,"merge_commit_sha":"bc53ed51b6f21971d210ddb012018ff2266a8e5d","assignee":null,"milestone":null,"commits_url":"https://api.github.com/repos/Originate/git-town/pulls/448/commits","review_comments_url":"https://api.github.com/repos/Originate/git-town/pulls/448/comments","review_comment_url":"https://api.github.com/repos/Originate/git-town/pulls/comments{/number}","comments_url":"https://api.github.com/repos/Originate/git-town/issues/448/comments","statuses_url":"https://api.github.com/repos/Originate/git-town/statuses/e5d67fede924010b61071d78d7e4baaa25c84a40","head":{"label":"ricmatsui:rm-git-extract-without-remote","ref":"rm-git-extract-without-remote","sha":"e5d67fede924010b61071d78d7e4baaa25c84a40","user":{"login":"ricmatsui","id":5288285,"avatar_url":"https://avatars.githubusercontent.com/u/5288285?v=3","gravatar_id":"","url":"https://api.github.com/users/ricmatsui","html_url":"https://github.com/ricmatsui","followers_url":"https://api.github.com/users/ricmatsui/followers","following_url":"https://api.github.com/users/ricmatsui/following{/other_user}","gists_url":"https://api.github.com/users/ricmatsui/gists{/gist_id}","starred_url":"https://api.github.com/users/ricmatsui/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/ricmatsui/subscriptions","organizations_url":"https://api.github.com/users/ricmatsui/orgs","repos_url":"https://api.github.com/users/ricmatsui/repos","events_url":"https://api.github.com/users/ricmatsui/events{/privacy}","received_events_url":"https://api.github.com/users/ricmatsui/received_events","type":"User","site_admin":false},"repo":{"id":31296480,"name":"git-town","full_name":"ricmatsui/git-town","owner":{"login":"ricmatsui","id":5288285,"avatar_url":"https://avatars.githubusercontent.com/u/5288285?v=3","gravatar_id":"","url":"https://api.github.com/users/ricmatsui","html_url":"https://github.com/ricmatsui","followers_url":"https://api.github.com/users/ricmatsui/followers","following_url":"https://api.github.com/users/ricmatsui/following{/other_user}","gists_url":"https://api.github.com/users/ricmatsui/gists{/gist_id}","starred_url":"https://api.github.com/users/ricmatsui/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/ricmatsui/subscriptions","organizations_url":"https://api.github.com/users/ricmatsui/orgs","repos_url":"https://api.github.com/users/ricmatsui/repos","events_url":"https://api.github.com/users/ricmatsui/events{/privacy}","received_events_url":"https://api.github.com/users/ricmatsui/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/ricmatsui/git-town","description":"High-level Git workflow extensions for agile development teams","fork":true,"url":"https://api.github.com/repos/ricmatsui/git-town","forks_url":"https://api.github.com/repos/ricmatsui/git-town/forks","keys_url":"https://api.github.com/repos/ricmatsui/git-town/keys{/key_id}","collaborators_url":"https://api.github.com/repos/ricmatsui/git-town/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/ricmatsui/git-town/teams","hooks_url":"https://api.github.com/repos/ricmatsui/git-town/hooks","issue_events_url":"https://api.github.com/repos/ricmatsui/git-town/issues/events{/number}","events_url":"https://api.github.com/repos/ricmatsui/git-town/events","assignees_url":"https://api.github.com/repos/ricmatsui/git-town/assignees{/user}","branches_url":"https://api.github.com/repos/ricmatsui/git-town/branches{/branch}","tags_url":"https://api.github.com/repos/ricmatsui/git-town/tags","blobs_url":"https://api.github.com/repos/ricmatsui/git-town/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/ricmatsui/git-town/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/ricmatsui/git-town/git/refs{/sha}","trees_url":"https://api.github.com/repos/ricmatsui/git-town/git/trees{/sha}","statuses_url":"https://api.github.com/repos/ricmatsui/git-town/statuses/{sha}","languages_url":"https://api.github.com/repos/ricmatsui/git-town/languages","stargazers_url":"https://api.github.com/repos/ricmatsui/git-town/stargazers","contributors_url":"https://api.github.com/repos/ricmatsui/git-town/contributors","subscribers_url":"https://api.github.com/repos/ricmatsui/git-town/subscribers","subscription_url":"https://api.github.com/repos/ricmatsui/git-town/subscription","commits_url":"https://api.github.com/repos/ricmatsui/git-town/commits{/sha}","git_commits_url":"https://api.github.com/repos/ricmatsui/git-town/git/commits{/sha}","comments_url":"https://api.github.com/repos/ricmatsui/git-town/comments{/number}","issue_comment_url":"https://api.github.com/repos/ricmatsui/git-town/issues/comments{/number}","contents_url":"https://api.github.com/repos/ricmatsui/git-town/contents/{+path}","compare_url":"https://api.github.com/repos/ricmatsui/git-town/compare/{base}...{head}","merges_url":"https://api.github.com/repos/ricmatsui/git-town/merges","archive_url":"https://api.github.com/repos/ricmatsui/git-town/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/ricmatsui/git-town/downloads","issues_url":"https://api.github.com/repos/ricmatsui/git-town/issues{/number}","pulls_url":"https://api.github.com/repos/ricmatsui/git-town/pulls{/number}","milestones_url":"https://api.github.com/repos/ricmatsui/git-town/milestones{/number}","notifications_url":"https://api.github.com/repos/ricmatsui/git-town/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/ricmatsui/git-town/labels{/name}","releases_url":"https://api.github.com/repos/ricmatsui/git-town/releases{/id}","created_at":"2015-02-25T04:07:52Z","updated_at":"2015-03-24T19:42:40Z","pushed_at":"2015-03-25T19:35:28Z","git_url":"git://github.com/ricmatsui/git-town.git","ssh_url":"git@github.com:ricmatsui/git-town.git","clone_url":"https://github.com/ricmatsui/git-town.git","svn_url":"https://github.com/ricmatsui/git-town","homepage":"","size":1019,"stargazers_count":0,"watchers_count":0,"language":"Cucumber","has_issues":true,"has_downloads":true,"has_wiki":false,"has_pages":true,"forks_count":0,"mirror_url":null,"open_issues_count":1,"forks":0,"open_issues":1,"watchers":0,"default_branch":"master"}},"base":{"label":"Originate:master","ref":"master","sha":"985a81e54714e868bfe84373dd3eb63de93e70bf","user":{"login":"Originate","id":1627168,"avatar_url":"https://avatars.githubusercontent.com/u/1627168?v=3","gravatar_id":"","url":"https://api.github.com/users/Originate","html_url":"https://github.com/Originate","followers_url":"https://api.github.com/users/Originate/followers","following_url":"https://api.github.com/users/Originate/following{/other_user}","gists_url":"https://api.github.com/users/Originate/gists{/gist_id}","starred_url":"https://api.github.com/users/Originate/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Originate/subscriptions","organizations_url":"https://api.github.com/users/Originate/orgs","repos_url":"https://api.github.com/users/Originate/repos","events_url":"https://api.github.com/users/Originate/events{/privacy}","received_events_url":"https://api.github.com/users/Originate/received_events","type":"Organization","site_admin":false},"repo":{"id":19825320,"name":"git-town","full_name":"Originate/git-town","owner":{"login":"Originate","id":1627168,"avatar_url":"https://avatars.githubusercontent.com/u/1627168?v=3","gravatar_id":"","url":"https://api.github.com/users/Originate","html_url":"https://github.com/Originate","followers_url":"https://api.github.com/users/Originate/followers","following_url":"https://api.github.com/users/Originate/following{/other_user}","gists_url":"https://api.github.com/users/Originate/gists{/gist_id}","starred_url":"https://api.github.com/users/Originate/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Originate/subscriptions","organizations_url":"https://api.github.com/users/Originate/orgs","repos_url":"https://api.github.com/users/Originate/repos","events_url":"https://api.github.com/users/Originate/events{/privacy}","received_events_url":"https://api.github.com/users/Originate/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/Originate/git-town","description":"Git extensions for robust, high-level development workflows","fork":false,"url":"https://api.github.com/repos/Originate/git-town","forks_url":"https://api.github.com/repos/Originate/git-town/forks","keys_url":"https://api.github.com/repos/Originate/git-town/keys{/key_id}","collaborators_url":"https://api.github.com/repos/Originate/git-town/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/Originate/git-town/teams","hooks_url":"https://api.github.com/repos/Originate/git-town/hooks","issue_events_url":"https://api.github.com/repos/Originate/git-town/issues/events{/number}","events_url":"https://api.github.com/repos/Originate/git-town/events","assignees_url":"https://api.github.com/repos/Originate/git-town/assignees{/user}","branches_url":"https://api.github.com/repos/Originate/git-town/branches{/branch}","tags_url":"https://api.github.com/repos/Originate/git-town/tags","blobs_url":"https://api.github.com/repos/Originate/git-town/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/Originate/git-town/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/Originate/git-town/git/refs{/sha}","trees_url":"https://api.github.com/repos/Originate/git-town/git/trees{/sha}","statuses_url":"https://api.github.com/repos/Originate/git-town/statuses/{sha}","languages_url":"https://api.github.com/repos/Originate/git-town/languages","stargazers_url":"https://api.github.com/repos/Originate/git-town/stargazers","contributors_url":"https://api.github.com/repos/Originate/git-town/contributors","subscribers_url":"https://api.github.com/repos/Originate/git-town/subscribers","subscription_url":"https://api.github.com/repos/Originate/git-town/subscription","commits_url":"https://api.github.com/repos/Originate/git-town/commits{/sha}","git_commits_url":"https://api.github.com/repos/Originate/git-town/git/commits{/sha}","comments_url":"https://api.github.com/repos/Originate/git-town/comments{/number}","issue_comment_url":"https://api.github.com/repos/Originate/git-town/issues/comments{/number}","contents_url":"https://api.github.com/repos/Originate/git-town/contents/{+path}","compare_url":"https://api.github.com/repos/Originate/git-town/compare/{base}...{head}","merges_url":"https://api.github.com/repos/Originate/git-town/merges","archive_url":"https://api.github.com/repos/Originate/git-town/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/Originate/git-town/downloads","issues_url":"https://api.github.com/repos/Originate/git-town/issues{/number}","pulls_url":"https://api.github.com/repos/Originate/git-town/pulls{/number}","milestones_url":"https://api.github.com/repos/Originate/git-town/milestones{/number}","notifications_url":"https://api.github.com/repos/Originate/git-town/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/Originate/git-town/labels{/name}","releases_url":"https://api.github.com/repos/Originate/git-town/releases{/id}","created_at":"2014-05-15T15:44:29Z","updated_at":"2015-03-25T16:09:13Z","pushed_at":"2015-03-25T19:35:29Z","git_url":"git://github.com/Originate/git-town.git","ssh_url":"git@github.com:Originate/git-town.git","clone_url":"https://github.com/Originate/git-town.git","svn_url":"https://github.com/Originate/git-town","homepage":"","size":14273,"stargazers_count":46,"watchers_count":46,"language":"Cucumber","has_issues":true,"has_downloads":true,"has_wiki":false,"has_pages":true,"forks_count":2,"mirror_url":null,"open_issues_count":47,"forks":2,"open_issues":47,"watchers":46,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/Originate/git-town/pulls/448"},"html":{"href":"https://github.com/Originate/git-town/pull/448"},"issue":{"href":"https://api.github.com/repos/Originate/git-town/issues/448"},"comments":{"href":"https://api.github.com/repos/Originate/git-town/issues/448/comments"},"review_comments":{"href":"https://api.github.com/repos/Originate/git-town/pulls/448/comments"},"review_comment":{"href":"https://api.github.com/repos/Originate/git-town/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/Originate/git-town/pulls/448/commits"},"statuses":{"href":"https://api.github.com/repos/Originate/git-town/statuses/e5d67fede924010b61071d78d7e4baaa25c84a40"}}}}