Skip to content

Instantly share code, notes, and snippets.

@ermakovpetr
Last active December 26, 2015 23:59
Show Gist options
  • Save ermakovpetr/8ebd434e75869d68005c to your computer and use it in GitHub Desktop.
Save ermakovpetr/8ebd434e75869d68005c to your computer and use it in GitHub Desktop.
Задание по git - task1
01. create repo (repo A)
02. repo A: create 1st commit with some files (file A, file B)
03. repo A: create branch branch1 from master
04. clone the current repo (repo B)
05. repo B, branch1: create 2nd commit containing new file (file C)
06. repo B: push changes to repo A
07. repo A, branch1: modify line#1 in file C and commit
08. repo B, branch1: modify line#1 in file C and commit
09. repo B, branch1: fetch changes from repo A
10. repo B, branch1: merge in repoA's branch1 (resolve conflict)
11. repo A: add repoB as new remote
12. repo A, branch1: merge in repoB's branch1
Результат: 2 репы repoA, repoB + отдельная репа со списком всех команд
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment