{"action":"created","issue":{"url":"https://api.github.com/repos/TEHGAM/ADR/issues/347","labels_url":"https://api.github.com/repos/TEHGAM/ADR/issues/347/labels{/name}","comments_url":"https://api.github.com/repos/TEHGAM/ADR/issues/347/comments","events_url":"https://api.github.com/repos/TEHGAM/ADR/issues/347/events","html_url":"https://github.com/TEHGAM/ADR/issues/347","id":57686753,"number":347,"title":"Совмещение веток с мастером","user":{"login":"a11archer","id":8246683,"avatar_url":"https://avatars.githubusercontent.com/u/8246683?v=3","gravatar_id":"","url":"https://api.github.com/users/a11archer","html_url":"https://github.com/a11archer","followers_url":"https://api.github.com/users/a11archer/followers","following_url":"https://api.github.com/users/a11archer/following{/other_user}","gists_url":"https://api.github.com/users/a11archer/gists{/gist_id}","starred_url":"https://api.github.com/users/a11archer/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/a11archer/subscriptions","organizations_url":"https://api.github.com/users/a11archer/orgs","repos_url":"https://api.github.com/users/a11archer/repos","events_url":"https://api.github.com/users/a11archer/events{/privacy}","received_events_url":"https://api.github.com/users/a11archer/received_events","type":"User","site_admin":false},"labels":[{"url":"https://api.github.com/repos/TEHGAM/ADR/labels/%D0%94%D0%BE%D0%BA%D1%83%D0%BC%D0%B5%D0%BD%D1%82%D0%B0%D1%86%D0%B8%D1%8F","name":"Документация","color":"4499CC"}],"state":"open","locked":false,"assignee":null,"milestone":null,"comments":1,"created_at":"2015-02-14T08:50:08Z","updated_at":"2015-02-14T08:51:35Z","closed_at":null,"body":"При совмещении ветки с мастером может выдавать ошибку что автоматически это не производится. Это потому что в Вашей ветке присутствует нормализация строк типа текст а в мастере нет. Для этого надо переключиться в режим ветки в Windows клиенте в верхней части экрана стрелочка вниз на названии репозитория которого выбрали слева. Там перечень всех веток включая Вашу.\r\n1) совместите Master на вашу ветку чтобы исправить нормализацию строк,\r\n2) проверьте что это не привело к дефекту ветки\r\n3) совместите с оригиналом и работайте уже без нормализейшн строк (он текст в одну строку при загрузке ветки с сайта пихал, - сразу заметно)"},"comment":{"url":"https://api.github.com/repos/TEHGAM/ADR/issues/comments/74367545","html_url":"https://github.com/TEHGAM/ADR/issues/347#issuecomment-74367545","issue_url":"https://api.github.com/repos/TEHGAM/ADR/issues/347","id":74367545,"user":{"login":"a11archer","id":8246683,"avatar_url":"https://avatars.githubusercontent.com/u/8246683?v=3","gravatar_id":"","url":"https://api.github.com/users/a11archer","html_url":"https://github.com/a11archer","followers_url":"https://api.github.com/users/a11archer/followers","following_url":"https://api.github.com/users/a11archer/following{/other_user}","gists_url":"https://api.github.com/users/a11archer/gists{/gist_id}","starred_url":"https://api.github.com/users/a11archer/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/a11archer/subscriptions","organizations_url":"https://api.github.com/users/a11archer/orgs","repos_url":"https://api.github.com/users/a11archer/repos","events_url":"https://api.github.com/users/a11archer/events{/privacy}","received_events_url":"https://api.github.com/users/a11archer/received_events","type":"User","site_admin":false},"created_at":"2015-02-14T08:51:35Z","updated_at":"2015-02-14T08:51:35Z","body":"это делается только один раз для ветки созданной ДО 14.02.2015. поздние ветки этой нормализации уже не имеют."}}