|
|
|
|
@ -838,5 +838,16 @@ $ git log --oneline --decorate --all --graph
|
|
|
|
|
* e7015d7 code: заготовка программы
|
|
|
|
|
|
|
|
|
|
39.Слил ветки и отправил на сервер.
|
|
|
|
|
|
|
|
|
|
16a9a1e refs/remotes/origin/main@{1}: update by push
|
|
|
|
|
7c5a29f HEAD@{2}: commit (merge): code: объединено с новым типом переменных
|
|
|
|
|
3e22618 HEAD@{3}: checkout: moving from double to main
|
|
|
|
|
0a1d2ec (double) HEAD@{4}: checkout: moving from main to double
|
|
|
|
|
|
|
|
|
|
git branch double
|
|
|
|
|
git checkout double
|
|
|
|
|
git status
|
|
|
|
|
git add main.cpp
|
|
|
|
|
git commit -m 'code: изменен тип переменных на double'
|
|
|
|
|
git checkout main
|
|
|
|
|
git merge double
|
|
|
|
|
|
|
|
|
|
|
