{"action":"created","issue":{"url":"https://api.github.com/repos/unravelin/tomono/issues/21","repository_url":"https://api.github.com/repos/unravelin/tomono","labels_url":"https://api.github.com/repos/unravelin/tomono/issues/21/labels{/name}","comments_url":"https://api.github.com/repos/unravelin/tomono/issues/21/comments","events_url":"https://api.github.com/repos/unravelin/tomono/issues/21/events","html_url":"https://github.com/unravelin/tomono/issues/21","id":306062606,"number":21,"title":"Merging branches afer migration","user":{"login":"calinvoichita","id":1915266,"avatar_url":"https://avatars2.githubusercontent.com/u/1915266?v=4","gravatar_id":"","url":"https://api.github.com/users/calinvoichita","html_url":"https://github.com/calinvoichita","followers_url":"https://api.github.com/users/calinvoichita/followers","following_url":"https://api.github.com/users/calinvoichita/following{/other_user}","gists_url":"https://api.github.com/users/calinvoichita/gists{/gist_id}","starred_url":"https://api.github.com/users/calinvoichita/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/calinvoichita/subscriptions","organizations_url":"https://api.github.com/users/calinvoichita/orgs","repos_url":"https://api.github.com/users/calinvoichita/repos","events_url":"https://api.github.com/users/calinvoichita/events{/privacy}","received_events_url":"https://api.github.com/users/calinvoichita/received_events","type":"User","site_admin":false},"labels":[],"state":"open","locked":false,"assignee":null,"assignees":[],"milestone":null,"comments":0,"created_at":"2018-03-16T20:14:02Z","updated_at":"2018-04-17T07:09:04Z","closed_at":null,"author_association":"NONE","body":"Hi,\r\n\r\nThanks for the script, it works as expected. Had some issues with slashes in the branch names, but you guys fixed them in the mean time.\r\n\r\nWe've been using git flow in all our individual repos until now. After running the migration script, as expected we have master, develop, and a few feature/X branches. The problem comes when trying to finish one of the features (merge it do develop). Git seems to be very confused and throws a lot of conflicts. Some concrete examples include: \r\n\r\n1. develop contains a file, while feature/f1 has deleted it. \r\n2. develop contains a file, while feature/f1 has renamed it.\r\n3. small files with changes (this can be fixed with setting rename-threshold lower)\r\n\r\nTrying to perform the same merge in the original repository shows no conflict. Based on my understanding, this issue arises because read-tree shows as an independent copy on each individual branch (develop and feature/f1).\r\n\r\nDid anybody encounter this issue? Any recommendations?\r\n\r\nThanks,\r\nCalin\r\n"},"comment":{"url":"https://api.github.com/repos/unravelin/tomono/issues/comments/381872481","html_url":"https://github.com/unravelin/tomono/issues/21#issuecomment-381872481","issue_url":"https://api.github.com/repos/unravelin/tomono/issues/21","id":381872481,"user":{"login":"amrtn","id":151747,"avatar_url":"https://avatars0.githubusercontent.com/u/151747?v=4","gravatar_id":"","url":"https://api.github.com/users/amrtn","html_url":"https://github.com/amrtn","followers_url":"https://api.github.com/users/amrtn/followers","following_url":"https://api.github.com/users/amrtn/following{/other_user}","gists_url":"https://api.github.com/users/amrtn/gists{/gist_id}","starred_url":"https://api.github.com/users/amrtn/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/amrtn/subscriptions","organizations_url":"https://api.github.com/users/amrtn/orgs","repos_url":"https://api.github.com/users/amrtn/repos","events_url":"https://api.github.com/users/amrtn/events{/privacy}","received_events_url":"https://api.github.com/users/amrtn/received_events","type":"User","site_admin":false},"created_at":"2018-04-17T07:09:04Z","updated_at":"2018-04-17T07:09:04Z","author_association":"NONE","body":"I've encountered the same problem. Still investigating the issue."}}
{"actor":{"display_login":"amrtn"}}