{"action":"created","issue":{"url":"https://api.github.com/repos/mhagger/git-imerge/issues/113","repository_url":"https://api.github.com/repos/mhagger/git-imerge","labels_url":"https://api.github.com/repos/mhagger/git-imerge/issues/113/labels{/name}","comments_url":"https://api.github.com/repos/mhagger/git-imerge/issues/113/comments","events_url":"https://api.github.com/repos/mhagger/git-imerge/issues/113/events","html_url":"https://github.com/mhagger/git-imerge/issues/113","id":187226398,"number":113,"title":"Problem with complex merge","user":{"login":"mgorovoy","id":126948,"avatar_url":"https://avatars.githubusercontent.com/u/126948?v=3","gravatar_id":"","url":"https://api.github.com/users/mgorovoy","html_url":"https://github.com/mgorovoy","followers_url":"https://api.github.com/users/mgorovoy/followers","following_url":"https://api.github.com/users/mgorovoy/following{/other_user}","gists_url":"https://api.github.com/users/mgorovoy/gists{/gist_id}","starred_url":"https://api.github.com/users/mgorovoy/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/mgorovoy/subscriptions","organizations_url":"https://api.github.com/users/mgorovoy/orgs","repos_url":"https://api.github.com/users/mgorovoy/repos","events_url":"https://api.github.com/users/mgorovoy/events{/privacy}","received_events_url":"https://api.github.com/users/mgorovoy/received_events","type":"User","site_admin":false},"labels":[],"state":"open","locked":false,"assignee":null,"assignees":[],"milestone":null,"comments":2,"created_at":"2016-11-04T00:39:54Z","updated_at":"2016-11-07T07:39:50Z","closed_at":null,"body":"I am working on a project with codebase that got severely diverged. The new release branches have been created from the previous release branches for a number of iterations, with all except the last one merged (manually) into development branch that may include some intermediate commits (see the diagram below). I wanted to try using git-imerge to perform merge of the latest un-merged release branch into development branch, but discovered that no matter what combination of arguments I've tried it would not work. Please let me know whether this could be done.\r\n\r\n     -A-.-.-.-.-.-.-.-.-.-.-.-.-.-.-Ae-.-.-.-.-.-.-.-.-.-Af-.-.-.-.-*\r\n         \\                          /                   /          /\r\n          -B-.-.-.-Bg-.-.-.-Bh-.-.-Bi                  /          ?\r\n                    \\        \\      \\                 /          /\r\n                     -C-.-.-.-Cj-.-.-Ck-.-.-Cm-.-.-.-Cn         ?\r\n                                             \\        \\        /\r\n                                              --Do-.-.-Dp-.-.-Dq"},"comment":{"url":"https://api.github.com/repos/mhagger/git-imerge/issues/comments/258766170","html_url":"https://github.com/mhagger/git-imerge/issues/113#issuecomment-258766170","issue_url":"https://api.github.com/repos/mhagger/git-imerge/issues/113","id":258766170,"user":{"login":"mhagger","id":119718,"avatar_url":"https://avatars.githubusercontent.com/u/119718?v=3","gravatar_id":"","url":"https://api.github.com/users/mhagger","html_url":"https://github.com/mhagger","followers_url":"https://api.github.com/users/mhagger/followers","following_url":"https://api.github.com/users/mhagger/following{/other_user}","gists_url":"https://api.github.com/users/mhagger/gists{/gist_id}","starred_url":"https://api.github.com/users/mhagger/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/mhagger/subscriptions","organizations_url":"https://api.github.com/users/mhagger/orgs","repos_url":"https://api.github.com/users/mhagger/repos","events_url":"https://api.github.com/users/mhagger/events{/privacy}","received_events_url":"https://api.github.com/users/mhagger/received_events","type":"User","site_admin":true},"created_at":"2016-11-07T07:39:50Z","updated_at":"2016-11-07T07:39:50Z","body":"It would be a lot easier to diagnose your problem with access to your repository. Is it publicly available? If not, could you anonymize it using `git fast-export --anonymize` and make the anonymized repository available? If so, please let us know where to find the repo and exactly what `git imerge` command line to use to provoke the problem.\r\n\r\nI don't have any idea if it would help, but have you tried running this using branch `loosen-first-parent-rule` from PR #111?\r\n"}}
{"actor":{"display_login":"mhagger"}}