-
Notifications
You must be signed in to change notification settings - Fork 0
/
2.Rebase
40 lines (40 loc) · 1003 Bytes
/
2.Rebase
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
$ git clone https://github.com/yarynayavor/rebase-second-task.git
$ cd rebase-second-task
$ explorer .
$ git br testbr
$ touch a.txt
$ git st
$ git add a.txt
$ git ci -m "Added a.txt file"
$ echo "Some text is here" >> a.txt
$ git add a.txt
$ git st
$ git ci -m "Added some text to a.txt file"
$ cat a.txt
$ touch b.txt
$ git st
$ git add b.txt
$ git ci -m "Added b.txt file"
$ echo "Hi! How are you?" >> b.txt
$ git add b.txt
$ git st
$ git ci -m "Added some text to b.txt file"
$ cat b.txt
$ git checkout testbr
$ git rebase master
$ echo "Some text add after rebase" >> a.txt
$ git st
$ git add .
$ git ci -m "Added some text after rebase to a.txt"
$ cat a.txt
$ touch c.txt
$ git add c.txt
$ git ci -m "Added new file c.txt after rebase in branch"
$ echo "New file with some text after rebasing master in my branch" >> c.txt
$ git add .
$ git ci -m "Added new file with some text after rebasing master in my branch"
$ cat c.txt
$ git checkout master
$ git merge testbr
$ git br -d testbr
$ git push