{"action":"created","issue":{"url":"https://api.github.com/repos/smashwilson/merge-conflicts/issues/134","labels_url":"https://api.github.com/repos/smashwilson/merge-conflicts/issues/134/labels{/name}","comments_url":"https://api.github.com/repos/smashwilson/merge-conflicts/issues/134/comments","events_url":"https://api.github.com/repos/smashwilson/merge-conflicts/issues/134/events","html_url":"https://github.com/smashwilson/merge-conflicts/issues/134","id":67093244,"number":134,"title":"Expand conflict detection to support different files using git diff","user":{"login":"Arlanthir","id":2780456,"avatar_url":"https://avatars.githubusercontent.com/u/2780456?v=3","gravatar_id":"","url":"https://api.github.com/users/Arlanthir","html_url":"https://github.com/Arlanthir","followers_url":"https://api.github.com/users/Arlanthir/followers","following_url":"https://api.github.com/users/Arlanthir/following{/other_user}","gists_url":"https://api.github.com/users/Arlanthir/gists{/gist_id}","starred_url":"https://api.github.com/users/Arlanthir/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Arlanthir/subscriptions","organizations_url":"https://api.github.com/users/Arlanthir/orgs","repos_url":"https://api.github.com/users/Arlanthir/repos","events_url":"https://api.github.com/users/Arlanthir/events{/privacy}","received_events_url":"https://api.github.com/users/Arlanthir/received_events","type":"User","site_admin":false},"labels":[{"url":"https://api.github.com/repos/smashwilson/merge-conflicts/labels/enhancement","name":"enhancement","color":"84b6eb"}],"state":"open","locked":false,"assignee":null,"milestone":null,"comments":1,"created_at":"2015-04-08T09:54:28Z","updated_at":"2015-04-12T14:54:57Z","closed_at":null,"body":"(This is an enhancement request. Apologies if it's outside the scope of development.)\r\n\r\nThis package could leverage the already stellar merge interface and the git diff command to allow the user to compare and merge two different versions of a file even if outside the repository (--no-index flag).\r\n\r\nThis would make it easier to manually copy changes from one file to another and merge changes to production files."},"comment":{"url":"https://api.github.com/repos/smashwilson/merge-conflicts/issues/comments/92076654","html_url":"https://github.com/smashwilson/merge-conflicts/issues/134#issuecomment-92076654","issue_url":"https://api.github.com/repos/smashwilson/merge-conflicts/issues/134","id":92076654,"user":{"login":"smashwilson","id":17565,"avatar_url":"https://avatars.githubusercontent.com/u/17565?v=3","gravatar_id":"","url":"https://api.github.com/users/smashwilson","html_url":"https://github.com/smashwilson","followers_url":"https://api.github.com/users/smashwilson/followers","following_url":"https://api.github.com/users/smashwilson/following{/other_user}","gists_url":"https://api.github.com/users/smashwilson/gists{/gist_id}","starred_url":"https://api.github.com/users/smashwilson/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/smashwilson/subscriptions","organizations_url":"https://api.github.com/users/smashwilson/orgs","repos_url":"https://api.github.com/users/smashwilson/repos","events_url":"https://api.github.com/users/smashwilson/events{/privacy}","received_events_url":"https://api.github.com/users/smashwilson/received_events","type":"User","site_admin":false},"created_at":"2015-04-12T14:54:57Z","updated_at":"2015-04-12T14:54:57Z","body":"Huh, that's a cool idea. I didn't even know you could do that.\r\n\r\nCan you give more details on how this would work, exactly? This is my first thought:\r\n\r\n * Open file A in an editor.\r\n * Invoke `merge-conflicts:manual-compare` (or whatever)\r\n * Choose file B from a dialog.\r\n * Run something like `git diff --no-index file-a file-b > file-a` ( :question: )\r\n * Detect \"conflicts\" now marked in file A and allow \"resolution\""}}