{"action":"created","comment":{"url":"https://api.github.com/repos/greatehop/progit2/pulls/comments/32310544","id":32310544,"diff_hunk":"@@ -1,63 +1,63 @@\n-=== Branching Workflows\n+=== Процеси Роботи з Гілками\n \n-Now that you have the basics of branching and merging down, what can or should you do with them?\n-In this section, we'll cover some common workflows that this lightweight branching makes possible, so you can decide if you would like to incorporate it into your own development cycle.\n+Тепер, коли ви навчилися основам роботи з гілками, що ж з ними можна чи потрібно робити далі?\n+В цьому розділі ми розкажемо про найбільш вживані підходи до роботи з гілками, які дозволяє така легка система галуження Git, а ви можете вирішити чи втілювати вам їх у свій робочий цикл.\n \n-==== Long-Running Branches\n+==== Довго-Триваючі Гілки\n \n (((branches, long-running)))\n-Because Git uses a simple three-way merge, merging from one branch into another multiple times over a long period is generally easy to do.\n-This means you can have several branches that are always open and that you use for different stages of your development cycle; you can merge regularly from some of them into others.\n+Оскільки Git використовує просте трьох-точкове злиття, то зливання одної гілки в іншу протягом тривалого часу зазвичай не є складною задачею.\n+Це означає, що ви можете мати кілька активних гілок та використовувати їх для різних стадій вашого робочого циклу; можете періодично зливати з одної гілки в іншу.\n \n-Many Git developers have a workflow that embraces this approach, such as having only code that is entirely stable in their `master` branch – possibly only code that has been or will be released.\n-They have another parallel branch named `develop` or `next` that they work from or use to test stability – it isn't necessarily always stable, but whenever it gets to a stable state, it can be merged into `master`.\n-It's used to pull in topic branches (short-lived branches, like your earlier `iss53` branch) when they're ready, to make sure they pass all the tests and don't introduce bugs.\n+Багато розробників підтримують з Git такий процес, коли тільки в `master` є стабільна версія коду - найімовірніше того, що був чи буде запроваджений у виробництво.\n+Також вони мають паралельні гілки `develop` чи `next`, які використовуються для тестування стабільності - це не обов'язково постійно стабільні гілки, але, як тільки вони стабілізовуються, їх можна зливати з `master`.\n+Також практикується мати тематичні гілки (коротко-термінові, як `iss53`, що ви створили раніше) та зливати їх, коли вони готові, проходять всі тести, та не привнесуть нових помилок.\n \n-In reality, we're talking about pointers moving up the line of commits you're making.\n-The stable branches are farther down the line in your commit history, and the bleeding-edge branches are farther up the history.\n+Насправді, ми маємо справу з вказівниками, що рухаються вздовж лінії комітів, які ви додаєте.\n+Стабільні гілки нижче по лінії ваших комітів, а \"кровоточащі\" гілки, ті що містять нові зміни, випереджують їх.\n \n-.A linear view of progressive-stability branching\n-image::images/lr-branches-1.png[A linear view of progressive-stability branching.]\n+.Лінійне представлення прогресування стабільності в гілках\n+image::images/lr-branches-1.png[Лінійне представлення прогресування стабільності в гілках.]\n \n-It's generally easier to think about them as work silos, where sets of commits graduate to a more stable silo when they're fully tested.\n+Взагалі простіше собі уявити цей процес як елеватор, коли набори комітів прямують до більш стабільних гілок, де вони повністю тестуються.\n \n [[lrbranch_b]]\n-.A ``silo'' view of progressive-stability branching\n-image::images/lr-branches-2.png[A ``silo'' view of progressive-stability branching.]\n+.``Елеваторне'' представлення прогресування стабільності в гілках\n+image::images/lr-branches-2.png[``Елеваторне'' представлення прогресування стабільності в гілках.]\n \n-You can keep doing this for several levels of stability.\n-Some larger projects also have a `proposed` or `pu` (proposed updates) branch that has integrated branches that may not be ready to go into the `next` or `master` branch.\n-The idea is that your branches are at various levels of stability; when they reach a more stable level, they're merged into the branch above them.\n-Again, having multiple long-running branches isn't necessary, but it's often helpful, especially when you're dealing with very large or complex projects.\n+Ви можете мати декілька рівнів стабільності.\n+На більших проектах також практикують мати `proposed` чи `pu` (proposed updates) гілки, де зберігаються гілки, що вже інтегровані, але не готові бути перенесені в основні гілки `next` чи `master`.\n+Ідея таких гілок в тому, що ваші гілки мають кілька рівнів стабільності і коли вони досягають більш стабільного рівня, їх зливають до гілок, котрі вище над ними.\n+Зверніть увагу, що мати кілька довготривалих гілок не обов'язково, проте буває корисним, особливо коли маєте справу з великими чи складними проектами.\n \n [[_topic_branch]]\n-==== Topic Branches\n+==== Тематичні Гілки\n \n (((branches, topic)))\n-Topic branches, however, are useful in projects of any size.\n-A topic branch is a short-lived branch that you create and use for a single particular feature or related work.\n-This is something you've likely never done with a VCS before because it's generally too expensive to create and merge branches.\n-But in Git it's common to create, work on, merge, and delete branches several times a day.\n+Тематичні гілки мають своє застосування в проектах будь-якого розміру.\n+Тематична гілки - це коротко-термінові гілки, що ви створюєте для окремо взятого завдання чи функціональності.","path":"book/03-git-branching/sections/workflows.asc","position":null,"original_position":63,"commit_id":"c39f23fc835e45d6c5b36c5c744bbcc73afee35b","original_commit_id":"2aab3813379d177047100cb3f87c91582fee7868","user":{"login":"tbudurovych","id":560824,"avatar_url":"https://avatars.githubusercontent.com/u/560824?v=3","gravatar_id":"","url":"https://api.github.com/users/tbudurovych","html_url":"https://github.com/tbudurovych","followers_url":"https://api.github.com/users/tbudurovych/followers","following_url":"https://api.github.com/users/tbudurovych/following{/other_user}","gists_url":"https://api.github.com/users/tbudurovych/gists{/gist_id}","starred_url":"https://api.github.com/users/tbudurovych/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/tbudurovych/subscriptions","organizations_url":"https://api.github.com/users/tbudurovych/orgs","repos_url":"https://api.github.com/users/tbudurovych/repos","events_url":"https://api.github.com/users/tbudurovych/events{/privacy}","received_events_url":"https://api.github.com/users/tbudurovych/received_events","type":"User","site_admin":false},"body":"поправив","created_at":"2015-06-12T12:16:55Z","updated_at":"2015-06-12T12:16:55Z","html_url":"https://github.com/greatehop/progit2/pull/16#discussion_r32310544","pull_request_url":"https://api.github.com/repos/greatehop/progit2/pulls/16","_links":{"self":{"href":"https://api.github.com/repos/greatehop/progit2/pulls/comments/32310544"},"html":{"href":"https://github.com/greatehop/progit2/pull/16#discussion_r32310544"},"pull_request":{"href":"https://api.github.com/repos/greatehop/progit2/pulls/16"}}},"pull_request":{"url":"https://api.github.com/repos/greatehop/progit2/pulls/16","id":37083889,"html_url":"https://github.com/greatehop/progit2/pull/16","diff_url":"https://github.com/greatehop/progit2/pull/16.diff","patch_url":"https://github.com/greatehop/progit2/pull/16.patch","issue_url":"https://api.github.com/repos/greatehop/progit2/issues/16","number":16,"state":"open","locked":false,"title":"basic-branching-and merging 100% branch-management 100% iso workflows 100%","user":{"login":"tbudurovych","id":560824,"avatar_url":"https://avatars.githubusercontent.com/u/560824?v=3","gravatar_id":"","url":"https://api.github.com/users/tbudurovych","html_url":"https://github.com/tbudurovych","followers_url":"https://api.github.com/users/tbudurovych/followers","following_url":"https://api.github.com/users/tbudurovych/following{/other_user}","gists_url":"https://api.github.com/users/tbudurovych/gists{/gist_id}","starred_url":"https://api.github.com/users/tbudurovych/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/tbudurovych/subscriptions","organizations_url":"https://api.github.com/users/tbudurovych/orgs","repos_url":"https://api.github.com/users/tbudurovych/repos","events_url":"https://api.github.com/users/tbudurovych/events{/privacy}","received_events_url":"https://api.github.com/users/tbudurovych/received_events","type":"User","site_admin":false},"body":"","created_at":"2015-06-06T03:17:32Z","updated_at":"2015-06-12T12:16:55Z","closed_at":null,"merged_at":null,"merge_commit_sha":"2321e70844cf3c2001a9058316fe6c9d976ce600","assignee":null,"milestone":null,"commits_url":"https://api.github.com/repos/greatehop/progit2/pulls/16/commits","review_comments_url":"https://api.github.com/repos/greatehop/progit2/pulls/16/comments","review_comment_url":"https://api.github.com/repos/greatehop/progit2/pulls/comments{/number}","comments_url":"https://api.github.com/repos/greatehop/progit2/issues/16/comments","statuses_url":"https://api.github.com/repos/greatehop/progit2/statuses/c39f23fc835e45d6c5b36c5c744bbcc73afee35b","head":{"label":"tbudurovych:master","ref":"master","sha":"c39f23fc835e45d6c5b36c5c744bbcc73afee35b","user":{"login":"tbudurovych","id":560824,"avatar_url":"https://avatars.githubusercontent.com/u/560824?v=3","gravatar_id":"","url":"https://api.github.com/users/tbudurovych","html_url":"https://github.com/tbudurovych","followers_url":"https://api.github.com/users/tbudurovych/followers","following_url":"https://api.github.com/users/tbudurovych/following{/other_user}","gists_url":"https://api.github.com/users/tbudurovych/gists{/gist_id}","starred_url":"https://api.github.com/users/tbudurovych/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/tbudurovych/subscriptions","organizations_url":"https://api.github.com/users/tbudurovych/orgs","repos_url":"https://api.github.com/users/tbudurovych/repos","events_url":"https://api.github.com/users/tbudurovych/events{/privacy}","received_events_url":"https://api.github.com/users/tbudurovych/received_events","type":"User","site_admin":false},"repo":{"id":35488009,"name":"progit2","full_name":"tbudurovych/progit2","owner":{"login":"tbudurovych","id":560824,"avatar_url":"https://avatars.githubusercontent.com/u/560824?v=3","gravatar_id":"","url":"https://api.github.com/users/tbudurovych","html_url":"https://github.com/tbudurovych","followers_url":"https://api.github.com/users/tbudurovych/followers","following_url":"https://api.github.com/users/tbudurovych/following{/other_user}","gists_url":"https://api.github.com/users/tbudurovych/gists{/gist_id}","starred_url":"https://api.github.com/users/tbudurovych/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/tbudurovych/subscriptions","organizations_url":"https://api.github.com/users/tbudurovych/orgs","repos_url":"https://api.github.com/users/tbudurovych/repos","events_url":"https://api.github.com/users/tbudurovych/events{/privacy}","received_events_url":"https://api.github.com/users/tbudurovych/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/tbudurovych/progit2","description":"Pro Git 2nd Edition","fork":true,"url":"https://api.github.com/repos/tbudurovych/progit2","forks_url":"https://api.github.com/repos/tbudurovych/progit2/forks","keys_url":"https://api.github.com/repos/tbudurovych/progit2/keys{/key_id}","collaborators_url":"https://api.github.com/repos/tbudurovych/progit2/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/tbudurovych/progit2/teams","hooks_url":"https://api.github.com/repos/tbudurovych/progit2/hooks","issue_events_url":"https://api.github.com/repos/tbudurovych/progit2/issues/events{/number}","events_url":"https://api.github.com/repos/tbudurovych/progit2/events","assignees_url":"https://api.github.com/repos/tbudurovych/progit2/assignees{/user}","branches_url":"https://api.github.com/repos/tbudurovych/progit2/branches{/branch}","tags_url":"https://api.github.com/repos/tbudurovych/progit2/tags","blobs_url":"https://api.github.com/repos/tbudurovych/progit2/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/tbudurovych/progit2/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/tbudurovych/progit2/git/refs{/sha}","trees_url":"https://api.github.com/repos/tbudurovych/progit2/git/trees{/sha}","statuses_url":"https://api.github.com/repos/tbudurovych/progit2/statuses/{sha}","languages_url":"https://api.github.com/repos/tbudurovych/progit2/languages","stargazers_url":"https://api.github.com/repos/tbudurovych/progit2/stargazers","contributors_url":"https://api.github.com/repos/tbudurovych/progit2/contributors","subscribers_url":"https://api.github.com/repos/tbudurovych/progit2/subscribers","subscription_url":"https://api.github.com/repos/tbudurovych/progit2/subscription","commits_url":"https://api.github.com/repos/tbudurovych/progit2/commits{/sha}","git_commits_url":"https://api.github.com/repos/tbudurovych/progit2/git/commits{/sha}","comments_url":"https://api.github.com/repos/tbudurovych/progit2/comments{/number}","issue_comment_url":"https://api.github.com/repos/tbudurovych/progit2/issues/comments{/number}","contents_url":"https://api.github.com/repos/tbudurovych/progit2/contents/{+path}","compare_url":"https://api.github.com/repos/tbudurovych/progit2/compare/{base}...{head}","merges_url":"https://api.github.com/repos/tbudurovych/progit2/merges","archive_url":"https://api.github.com/repos/tbudurovych/progit2/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/tbudurovych/progit2/downloads","issues_url":"https://api.github.com/repos/tbudurovych/progit2/issues{/number}","pulls_url":"https://api.github.com/repos/tbudurovych/progit2/pulls{/number}","milestones_url":"https://api.github.com/repos/tbudurovych/progit2/milestones{/number}","notifications_url":"https://api.github.com/repos/tbudurovych/progit2/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/tbudurovych/progit2/labels{/name}","releases_url":"https://api.github.com/repos/tbudurovych/progit2/releases{/id}","created_at":"2015-05-12T13:00:40Z","updated_at":"2015-05-12T13:00:41Z","pushed_at":"2015-06-12T12:16:20Z","git_url":"git://github.com/tbudurovych/progit2.git","ssh_url":"git@github.com:tbudurovych/progit2.git","clone_url":"https://github.com/tbudurovych/progit2.git","svn_url":"https://github.com/tbudurovych/progit2","homepage":null,"size":166531,"stargazers_count":0,"watchers_count":0,"language":"CSS","has_issues":false,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"open_issues_count":0,"forks":0,"open_issues":0,"watchers":0,"default_branch":"master"}},"base":{"label":"greatehop:master","ref":"master","sha":"a450b394d14ab16706104ec74b4e26d87f2cee0b","user":{"login":"greatehop","id":686495,"avatar_url":"https://avatars.githubusercontent.com/u/686495?v=3","gravatar_id":"","url":"https://api.github.com/users/greatehop","html_url":"https://github.com/greatehop","followers_url":"https://api.github.com/users/greatehop/followers","following_url":"https://api.github.com/users/greatehop/following{/other_user}","gists_url":"https://api.github.com/users/greatehop/gists{/gist_id}","starred_url":"https://api.github.com/users/greatehop/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/greatehop/subscriptions","organizations_url":"https://api.github.com/users/greatehop/orgs","repos_url":"https://api.github.com/users/greatehop/repos","events_url":"https://api.github.com/users/greatehop/events{/privacy}","received_events_url":"https://api.github.com/users/greatehop/received_events","type":"User","site_admin":false},"repo":{"id":35365598,"name":"progit2","full_name":"greatehop/progit2","owner":{"login":"greatehop","id":686495,"avatar_url":"https://avatars.githubusercontent.com/u/686495?v=3","gravatar_id":"","url":"https://api.github.com/users/greatehop","html_url":"https://github.com/greatehop","followers_url":"https://api.github.com/users/greatehop/followers","following_url":"https://api.github.com/users/greatehop/following{/other_user}","gists_url":"https://api.github.com/users/greatehop/gists{/gist_id}","starred_url":"https://api.github.com/users/greatehop/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/greatehop/subscriptions","organizations_url":"https://api.github.com/users/greatehop/orgs","repos_url":"https://api.github.com/users/greatehop/repos","events_url":"https://api.github.com/users/greatehop/events{/privacy}","received_events_url":"https://api.github.com/users/greatehop/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/greatehop/progit2","description":"Pro Git 2nd Edition","fork":true,"url":"https://api.github.com/repos/greatehop/progit2","forks_url":"https://api.github.com/repos/greatehop/progit2/forks","keys_url":"https://api.github.com/repos/greatehop/progit2/keys{/key_id}","collaborators_url":"https://api.github.com/repos/greatehop/progit2/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/greatehop/progit2/teams","hooks_url":"https://api.github.com/repos/greatehop/progit2/hooks","issue_events_url":"https://api.github.com/repos/greatehop/progit2/issues/events{/number}","events_url":"https://api.github.com/repos/greatehop/progit2/events","assignees_url":"https://api.github.com/repos/greatehop/progit2/assignees{/user}","branches_url":"https://api.github.com/repos/greatehop/progit2/branches{/branch}","tags_url":"https://api.github.com/repos/greatehop/progit2/tags","blobs_url":"https://api.github.com/repos/greatehop/progit2/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/greatehop/progit2/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/greatehop/progit2/git/refs{/sha}","trees_url":"https://api.github.com/repos/greatehop/progit2/git/trees{/sha}","statuses_url":"https://api.github.com/repos/greatehop/progit2/statuses/{sha}","languages_url":"https://api.github.com/repos/greatehop/progit2/languages","stargazers_url":"https://api.github.com/repos/greatehop/progit2/stargazers","contributors_url":"https://api.github.com/repos/greatehop/progit2/contributors","subscribers_url":"https://api.github.com/repos/greatehop/progit2/subscribers","subscription_url":"https://api.github.com/repos/greatehop/progit2/subscription","commits_url":"https://api.github.com/repos/greatehop/progit2/commits{/sha}","git_commits_url":"https://api.github.com/repos/greatehop/progit2/git/commits{/sha}","comments_url":"https://api.github.com/repos/greatehop/progit2/comments{/number}","issue_comment_url":"https://api.github.com/repos/greatehop/progit2/issues/comments{/number}","contents_url":"https://api.github.com/repos/greatehop/progit2/contents/{+path}","compare_url":"https://api.github.com/repos/greatehop/progit2/compare/{base}...{head}","merges_url":"https://api.github.com/repos/greatehop/progit2/merges","archive_url":"https://api.github.com/repos/greatehop/progit2/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/greatehop/progit2/downloads","issues_url":"https://api.github.com/repos/greatehop/progit2/issues{/number}","pulls_url":"https://api.github.com/repos/greatehop/progit2/pulls{/number}","milestones_url":"https://api.github.com/repos/greatehop/progit2/milestones{/number}","notifications_url":"https://api.github.com/repos/greatehop/progit2/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/greatehop/progit2/labels{/name}","releases_url":"https://api.github.com/repos/greatehop/progit2/releases{/id}","created_at":"2015-05-10T09:51:53Z","updated_at":"2015-05-28T21:50:56Z","pushed_at":"2015-06-12T12:16:21Z","git_url":"git://github.com/greatehop/progit2.git","ssh_url":"git@github.com:greatehop/progit2.git","clone_url":"https://github.com/greatehop/progit2.git","svn_url":"https://github.com/greatehop/progit2","homepage":null,"size":166705,"stargazers_count":0,"watchers_count":0,"language":"CSS","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":2,"mirror_url":null,"open_issues_count":13,"forks":2,"open_issues":13,"watchers":0,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/greatehop/progit2/pulls/16"},"html":{"href":"https://github.com/greatehop/progit2/pull/16"},"issue":{"href":"https://api.github.com/repos/greatehop/progit2/issues/16"},"comments":{"href":"https://api.github.com/repos/greatehop/progit2/issues/16/comments"},"review_comments":{"href":"https://api.github.com/repos/greatehop/progit2/pulls/16/comments"},"review_comment":{"href":"https://api.github.com/repos/greatehop/progit2/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/greatehop/progit2/pulls/16/commits"},"statuses":{"href":"https://api.github.com/repos/greatehop/progit2/statuses/c39f23fc835e45d6c5b36c5c744bbcc73afee35b"}}}}