{"draftJsState":{"blocks":[{"data":{"image":{"id":"6a3fc4ea27d7ec5075397e9c"}},"depth":0,"entityRanges":[],"inlineStyleRanges":[],"text":"","type":"atomic:image","key":"c11ut"},{"data":{},"depth":0,"entityRanges":[],"inlineStyleRanges":[],"text":"Git — это система для отслеживания версий файлов. В одиночку она просто удобна. В команде — спасение.","type":"unstyled","key":"7k07m"},{"data":{},"depth":0,"entityRanges":[],"inlineStyleRanges":[],"text":"Спойлер: Git не сложный. Хватит 5 команд для 90% задач.","type":"unstyled","key":"6b61u"},{"data":{},"depth":0,"entityRanges":[],"inlineStyleRanges":[],"text":"Что такое коммит","type":"header-two","key":"702d6"},{"data":{},"depth":0,"entityRanges":[],"inlineStyleRanges":[],"text":"Коммит — снимок проекта в текущий момент. Как контрольная точка в игре — всегда можно откатиться.","type":"unstyled","key":"2jtjb"},{"data":{},"depth":0,"entityRanges":[],"inlineStyleRanges":[],"text":"Как сделать первый коммит:","type":"unstyled","key":"bb9o2"},{"data":{},"depth":0,"entityRanges":[],"inlineStyleRanges":[],"text":"```","type":"unstyled","key":"60l7n"},{"data":{},"depth":0,"entityRanges":[],"inlineStyleRanges":[],"text":"git init","type":"unstyled","key":"36j4"},{"data":{},"depth":0,"entityRanges":[],"inlineStyleRanges":[],"text":"git add .","type":"unstyled","key":"6loqk"},{"data":{},"depth":0,"entityRanges":[],"inlineStyleRanges":[],"text":"git commit -m \"Первый коммит\"","type":"unstyled","key":"3hcem"},{"data":{},"depth":0,"entityRanges":[],"inlineStyleRanges":[],"text":"```","type":"unstyled","key":"c3698"},{"data":{},"depth":0,"entityRanges":[],"inlineStyleRanges":[],"text":"`git add` — добавляет файлы в подготовку. `git commit` — сохраняет снимок.","type":"unstyled","key":"ed3ab"},{"data":{},"depth":0,"entityRanges":[],"inlineStyleRanges":[],"text":"Коммить часто и мало. Один коммит — одно изменение. Сообщение пиши коротко: «добавил регистрацию», «починил багу».","type":"unstyled","key":"b96jt"},{"data":{},"depth":0,"entityRanges":[],"inlineStyleRanges":[],"text":"Ветки — это просто","type":"header-two","key":"7pggd"},{"data":{},"depth":0,"entityRanges":[],"inlineStyleRanges":[],"text":"Ветка — отдельная линия разработки. По умолчанию ты в `main`.","type":"unstyled","key":"7hodb"},{"data":{},"depth":0,"entityRanges":[],"inlineStyleRanges":[],"text":"Зачем ветки:","type":"unstyled","key":"5m36o"},{"data":{},"depth":0,"entityRanges":[],"inlineStyleRanges":[],"text":"фича не ломает работающий код","type":"unordered-list-item","key":"d64q5"},{"data":{},"depth":0,"entityRanges":[],"inlineStyleRanges":[],"text":"можно экспериментировать без страха","type":"unordered-list-item","key":"bqo92"},{"data":{},"depth":0,"entityRanges":[],"inlineStyleRanges":[],"text":"несколько человек работают одновременно","type":"unordered-list-item","key":"62ab7"},{"data":{},"depth":0,"entityRanges":[],"inlineStyleRanges":[],"text":"Создать и переключиться:","type":"unstyled","key":"3q7gd"},{"data":{},"depth":0,"entityRanges":[],"inlineStyleRanges":[],"text":"```","type":"unstyled","key":"d7nh0"},{"data":{},"depth":0,"entityRanges":[],"inlineStyleRanges":[],"text":"git branch my-feature","type":"unstyled","key":"41oe9"},{"data":{},"depth":0,"entityRanges":[],"inlineStyleRanges":[],"text":"git switch my-feature","type":"unstyled","key":"c22au"},{"data":{},"depth":0,"entityRanges":[],"inlineStyleRanges":[],"text":"```","type":"unstyled","key":"20rf0"},{"data":{},"depth":0,"entityRanges":[],"inlineStyleRanges":[],"text":"Или одной командой: `git switch -c my-feature`.","type":"unstyled","key":"bnlos"},{"data":{},"depth":0,"entityRanges":[],"inlineStyleRanges":[],"text":"Все коммиты теперь попадают только в эту ветку. `main` остаётся нетронутой.","type":"unstyled","key":"c3hf5"},{"data":{},"depth":0,"entityRanges":[],"inlineStyleRanges":[],"text":"Посмотреть ветки: `git branch`. Текущая помечена (*).","type":"unstyled","key":"df2lt"},{"data":{},"depth":0,"entityRanges":[],"inlineStyleRanges":[],"text":"Слияние веток","type":"header-two","key":"c0kd5"},{"data":{},"depth":0,"entityRanges":[],"inlineStyleRanges":[],"text":"Когда фича готова, вливай её в `main`:","type":"unstyled","key":"942eg"},{"data":{},"depth":0,"entityRanges":[],"inlineStyleRanges":[],"text":"```","type":"unstyled","key":"bf5un"},{"data":{},"depth":0,"entityRanges":[],"inlineStyleRanges":[],"text":"git switch main","type":"unstyled","key":"2o5oo"},{"data":{},"depth":0,"entityRanges":[],"inlineStyleRanges":[],"text":"git merge my-feature","type":"unstyled","key":"3bcmb"},{"data":{},"depth":0,"entityRanges":[],"inlineStyleRanges":[],"text":"```","type":"unstyled","key":"52vk5"},{"data":{},"depth":0,"entityRanges":[],"inlineStyleRanges":[],"text":"После слияния ветку можно удалить: `git branch -d my-feature`.","type":"unstyled","key":"c5mc9"},{"data":{},"depth":0,"entityRanges":[],"inlineStyleRanges":[],"text":"Конфликты: их не надо бояться","type":"header-two","key":"cmtq3"},{"data":{},"depth":0,"entityRanges":[],"inlineStyleRanges":[],"text":"Конфликт — это когда Git не знает, какой из двух вариантов правильный. Это нормально. Бывает, когда два человека изменили одну и ту же строку файла.","type":"unstyled","key":"1sjji"},{"data":{},"depth":0,"entityRanges":[],"inlineStyleRanges":[],"text":"Git покажет примерно такое:","type":"unstyled","key":"cmefc"},{"data":{},"depth":0,"entityRanges":[],"inlineStyleRanges":[],"text":"```","type":"unstyled","key":"3csg8"},{"data":{},"depth":0,"entityRanges":[],"inlineStyleRanges":[],"text":"<<<<<<< HEAD","type":"unstyled","key":"2qg6e"},{"data":{},"depth":0,"entityRanges":[],"inlineStyleRanges":[],"text":"старый текст","type":"unstyled","key":"b0gab"},{"data":{},"depth":0,"entityRanges":[],"inlineStyleRanges":[],"text":"=======","type":"unstyled","key":"41tis"},{"data":{},"depth":0,"entityRanges":[],"inlineStyleRanges":[],"text":"новый текст","type":"unstyled","key":"apsut"},{"data":{},"depth":0,"entityRanges":[],"inlineStyleRanges":[],"text":">>>>>>> my-feature","type":"unstyled","key":"aesfj"},{"data":{},"depth":0,"entityRanges":[],"inlineStyleRanges":[],"text":"```","type":"unstyled","key":"dt6ma"},{"data":{},"depth":0,"entityRanges":[],"inlineStyleRanges":[],"text":"Твоя задача:","type":"unstyled","key":"eic7h"},{"data":{},"depth":0,"entityRanges":[],"inlineStyleRanges":[],"text":"открыть файл в редакторе","type":"unordered-list-item","key":"9hon7"},{"data":{},"depth":0,"entityRanges":[],"inlineStyleRanges":[],"text":"оставить правильный вариант (или объединить оба)","type":"unordered-list-item","key":"neju"},{"data":{},"depth":0,"entityRanges":[],"inlineStyleRanges":[],"text":"удалить маркеры `<<<<<<<`, `=======`, `>>>>>>>`","type":"unordered-list-item","key":"ekvku"},{"data":{},"depth":0,"entityRanges":[],"inlineStyleRanges":[],"text":"сделать `git add` и `git commit`","type":"unordered-list-item","key":"fq8vc"},{"data":{},"depth":0,"entityRanges":[],"inlineStyleRanges":[],"text":"Всё. Конфликт решён.","type":"unstyled","key":"evpqa"},{"data":{},"depth":0,"entityRanges":[],"inlineStyleRanges":[],"text":"Как откатить изменения","type":"header-two","key":"7s698"},{"data":{},"depth":0,"entityRanges":[],"inlineStyleRanges":[],"text":"Ошибся? Бывает.","type":"unstyled","key":"90k6c"},{"data":{},"depth":0,"entityRanges":[],"inlineStyleRanges":[],"text":"Отменить изменения в файле (ещё не закоммитил):","type":"unstyled","key":"duj5a"},{"data":{},"depth":0,"entityRanges":[],"inlineStyleRanges":[],"text":"```","type":"unstyled","key":"5p6fr"},{"data":{},"depth":0,"entityRanges":[],"inlineStyleRanges":[],"text":"git restore file.txt","type":"unstyled","key":"79bkk"},{"data":{},"depth":0,"entityRanges":[],"inlineStyleRanges":[],"text":"```","type":"unstyled","key":"14qds"},{"data":{},"depth":0,"entityRanges":[],"inlineStyleRanges":[],"text":"Отменить последний коммит, но сохранить изменения в файлах:","type":"unstyled","key":"2eig9"},{"data":{},"depth":0,"entityRanges":[],"inlineStyleRanges":[],"text":"```","type":"unstyled","key":"ce38r"},{"data":{},"depth":0,"entityRanges":[],"inlineStyleRanges":[],"text":"git reset --soft HEAD~1","type":"unstyled","key":"bhim6"},{"data":{},"depth":0,"entityRanges":[],"inlineStyleRanges":[],"text":"```","type":"unstyled","key":"2m9rs"},{"data":{},"depth":0,"entityRanges":[],"inlineStyleRanges":[],"text":"Отменить последний коммит и выкинуть изменения:","type":"unstyled","key":"5onr9"},{"data":{},"depth":0,"entityRanges":[],"inlineStyleRanges":[],"text":"```","type":"unstyled","key":"gvm3"},{"data":{},"depth":0,"entityRanges":[],"inlineStyleRanges":[],"text":"git reset --hard HEAD~1","type":"unstyled","key":"53u8s"},{"data":{},"depth":0,"entityRanges":[],"inlineStyleRanges":[],"text":"```","type":"unstyled","key":"b312j"},{"data":{},"depth":0,"entityRanges":[],"inlineStyleRanges":[],"text":"Github: работаем в команде","type":"header-two","key":"fuj75"},{"data":{},"depth":0,"entityRanges":[],"inlineStyleRanges":[],"text":"Git — это локально. GitHub — сервер, где хранятся репозитории и где команда общается.","type":"unstyled","key":"4180m"},{"data":{},"depth":0,"entityRanges":[],"inlineStyleRanges":[],"text":"Основная связка:","type":"unstyled","key":"4pmfl"},{"data":{},"depth":0,"entityRanges":[],"inlineStyleRanges":[],"text":"```","type":"unstyled","key":"76rl1"},{"data":{},"depth":0,"entityRanges":[],"inlineStyleRanges":[],"text":"git clone url # скачать репозиторий","type":"unstyled","key":"38jgj"},{"data":{},"depth":0,"entityRanges":[],"inlineStyleRanges":[],"text":"git pull # забрать изменения из интернета","type":"unstyled","key":"d626e"},{"data":{},"depth":0,"entityRanges":[],"inlineStyleRanges":[],"text":"git push # отправить свои коммиты в интернет","type":"unstyled","key":"2beiv"},{"data":{},"depth":0,"entityRanges":[],"inlineStyleRanges":[],"text":"```","type":"unstyled","key":"a3teh"},{"data":{},"depth":0,"entityRanges":[],"inlineStyleRanges":[],"text":"Перед тем как пушить, всегда делай `git pull`, чтобы подтянуть чужие изменения. Иначе Git попросит сначала слить их с твоими.","type":"unstyled","key":"c1o4t"},{"data":{},"depth":0,"entityRanges":[],"inlineStyleRanges":[],"text":"Pull request (он же merge request) — это не команда, а процесс на GitHub. Ты предлагаешь свои изменения, команда смотрит, обсуждает, и если всё ок — вливает.","type":"unstyled","key":"o5mr"},{"data":{},"depth":0,"entityRanges":[],"inlineStyleRanges":[],"text":"Шпаргалка","type":"header-two","key":"4ace7"},{"data":{},"depth":0,"entityRanges":[],"inlineStyleRanges":[],"text":"Действие Команда Начать Git-репозиторий `git init` Добавить файлы в коммит `git add file.txt` Сделать коммит `git commit -m \"сообщение\"` Новая ветка `git branch name` Переключиться на ветку `git switch name` Создать и переключиться `git switch -c name` Слить ветку `git merge name` Забрать изменения `git pull` Отправить изменения `git push` Посмотреть историю `git log --oneline --graph`","type":"unstyled","key":"dl8pr"},{"data":{},"depth":0,"entityRanges":[],"inlineStyleRanges":[],"text":"Итог","type":"header-two","key":"800n0"},{"data":{},"depth":0,"entityRanges":[],"inlineStyleRanges":[],"text":"Git — это база. Освоить его за час реально, если не лезть в дебри. Начни с трёх команд: `add`, `commit`, `push`. Когда привыкнешь — добавляй ветки и слияния. Конфликты пугают только в первый раз.","type":"unstyled","key":"ct0cf"},{"data":{},"depth":0,"entityRanges":[],"inlineStyleRanges":[],"text":"Подпишись на канал, чтобы не пропускать новые статьи по программированию и технологиям.","type":"unstyled","key":"5cl8"},{"data":{},"depth":0,"entityRanges":[],"inlineStyleRanges":[],"text":"","type":"marker","key":"ulJanVlk9ilZsyBFSc5r"}],"entityMap":{}},"mentions":[]}