This shows you the differences between two versions of the page.
Both sides previous revision Previous revision Next revision | Previous revision Next revision Both sides next revision | ||
сервис_git [2022/09/22 14:55] val [Пример с тестовой веткой] |
сервис_git [2022/09/29 14:59] val [Пример с тестовой веткой] |
||
---|---|---|---|
Line 1: | Line 1: | ||
====== Сервис Git ====== | ====== Сервис Git ====== | ||
+ | |||
+ | * [[https://ru.wikipedia.org/wiki/Git|Git - Википедия]] | ||
* [[https://git-scm.com/book/ru/v2/|The entire Pro Git book (на русском)]] | * [[https://git-scm.com/book/ru/v2/|The entire Pro Git book (на русском)]] | ||
Line 9: | Line 11: | ||
* [[https://www.theserverside.com/feature/Why-GitHub-renamed-its-master-branch-to-main|Why GitHub renamed its master branch to main]] | * [[https://www.theserverside.com/feature/Why-GitHub-renamed-its-master-branch-to-main|Why GitHub renamed its master branch to main]] | ||
- | * [[https://youtu.be/SEvR78OhGtw|youtube/Артем Матяшов/Git. Большой практический выпуск]] | + | * [[https://youtu.be/SEvR78OhGtw|youtube/Артем Матяшов/Git. Большой практический выпуск (youtube)]] |
===== Работа с локальным репозиторием ===== | ===== Работа с локальным репозиторием ===== | ||
Line 222: | Line 224: | ||
λ git checkout main | λ git checkout main | ||
+ | λ git checkout master | ||
λ git merge test | λ git merge test |