| ... | ... | @@ -36,6 +36,10 @@ fetch, pull, push |
|
|
|
|
|
|
|
2. Для подготовки к практике я сделал пару уровней в эмуляторе learngitbranching:
|
|
|
|
|
|
|
|
3. 
|
|
|
|
|
|
|
|
4. [Работа с merge tools](https://gitlab.maxvas.ru/science/pre-accelerator/-/wikis/%D0%9D%D0%B0%D1%81%D1%82%D1%80%D0%BE%D0%B9%D0%BA%D0%B0-Git-%D0%B2-Windows)
|
|
|
|
|
|
|
|
https://learngitbranching.js.org/?gist_level_id=44c20120c980f696f3df82f2abdcaacd (merge+rebase)
|
|
|
|
|
|
|
|
https://learngitbranching.js.org/?gist_level_id=f0ccca93ab56dbc76eabe3464bcc1fc9 (cherry-pick)
|
| ... | ... | |