{"action":"created","issue":{"url":"https://api.github.com/repos/Originate/git-town/issues/314","labels_url":"https://api.github.com/repos/Originate/git-town/issues/314/labels{/name}","comments_url":"https://api.github.com/repos/Originate/git-town/issues/314/comments","events_url":"https://api.github.com/repos/Originate/git-town/issues/314/events","html_url":"https://github.com/Originate/git-town/pull/314","id":53144097,"number":314,"title":"git-sync-all","user":{"login":"charlierudolph","id":1676758,"avatar_url":"https://avatars.githubusercontent.com/u/1676758?v=3","gravatar_id":"","url":"https://api.github.com/users/charlierudolph","html_url":"https://github.com/charlierudolph","followers_url":"https://api.github.com/users/charlierudolph/followers","following_url":"https://api.github.com/users/charlierudolph/following{/other_user}","gists_url":"https://api.github.com/users/charlierudolph/gists{/gist_id}","starred_url":"https://api.github.com/users/charlierudolph/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/charlierudolph/subscriptions","organizations_url":"https://api.github.com/users/charlierudolph/orgs","repos_url":"https://api.github.com/users/charlierudolph/repos","events_url":"https://api.github.com/users/charlierudolph/events{/privacy}","received_events_url":"https://api.github.com/users/charlierudolph/received_events","type":"User","site_admin":false},"labels":[],"state":"open","locked":false,"assignee":null,"milestone":null,"comments":3,"created_at":"2014-12-30T20:23:55Z","updated_at":"2015-01-01T17:49:56Z","closed_at":null,"pull_request":{"url":"https://api.github.com/repos/Originate/git-town/pulls/314","html_url":"https://github.com/Originate/git-town/pull/314","diff_url":"https://github.com/Originate/git-town/pull/314.diff","patch_url":"https://github.com/Originate/git-town/pull/314.patch"},"body":"@kevgo @allewun \r\n\r\n\r\nI broke up first and last branch in all conflict cases to make sure aborting / skipping / continuing worked as expected.\r\n\r\nTests are structured as follows:\r\n\r\n* feature_branch_merge_main_branch_conflict\r\n  * with_tracking_branch_updates\r\n    * first_branch\r\n       * with_open_changes.feature\r\n       * without_open_changes.feature\r\n    * last_branch\r\n       * with_open_changes.feature\r\n       * without_open_changes.feature\r\n  * without_tracking_branch_updates\r\n    * first_branch\r\n       * with_open_changes.feature\r\n       * without_open_changes.feature\r\n    * last_branch\r\n       * with_open_changes.feature\r\n       * without_open_changes.feature\r\n* feature_branch_merge_tracking_branch_conflict\r\n    * first_branch\r\n       * with_open_changes.feature\r\n       * without_open_changes.feature\r\n    * last_branch\r\n       * with_open_changes.feature\r\n       * without_open_changes.feature\r\n* main_branch_rebase_tracking_branch_conflict\r\n  * with_open_changes.feature\r\n  * without_open_changes.feature\r\n* no_conflicts\r\n   * feature_branches\r\n     * with_open_changes.feature\r\n     * without_open_changes.feature\r\n   * non_feature_branches\r\n     * with_open_changes.feature\r\n     * without_open_changes.feature\r\n   * remote_only_branches\r\n     * with_open_changes.feature\r\n     * without_open_changes.feature\r\n* non_feature_branch_rebase_tracking_branch_conflict\r\n  * first_branch\r\n     * with_open_changes.feature\r\n     * without_open_changes.feature\r\n  * last_branch\r\n     * with_open_changes.feature\r\n     * without_open_changes.feature"},"comment":{"url":"https://api.github.com/repos/Originate/git-town/issues/comments/68492954","html_url":"https://github.com/Originate/git-town/pull/314#issuecomment-68492954","issue_url":"https://api.github.com/repos/Originate/git-town/issues/314","id":68492954,"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},"created_at":"2015-01-01T17:49:56Z","updated_at":"2015-01-01T17:49:56Z","body":"+1 on `git sync --all`"}}