File tree Expand file tree Collapse file tree 8 files changed +503
-16
lines changed Expand file tree Collapse file tree 8 files changed +503
-16
lines changed Original file line number Diff line number Diff line change 1+ initialization :
2+ steps :
3+ - type : commit
4+ empty : true
5+ message : Empty commit
6+ id : start
7+ - type : new-file
8+ filename : conflict.txt
9+ contents : |
10+ Hello world
11+ - type : add
12+ files :
13+ - conflict.txt
14+ - type : commit
15+ message : Expected branch point
16+ - type : tag
17+ tag-name : v1.0
18+
19+ - type : branch
20+ branch-name : feature-search
21+ - type : edit-file
22+ filename : conflict.txt
23+ contents : |
24+ Hello world!
25+ - type : add
26+ files :
27+ - conflict.txt
28+ - type : commit
29+ message : Feature search changes
30+ - type : checkout
31+ branch-name : main
32+
33+ - type : branch
34+ branch-name : feature-delete
35+ - type : edit-file
36+ filename : conflict.txt
37+ contents : |
38+ Hello world?
39+ - type : add
40+ files :
41+ - conflict.txt
42+ - type : commit
43+ message : Feature delete changes
44+ - type : checkout
45+ branch-name : main
46+
47+ - type : branch
48+ branch-name : feature-list
49+ - type : commit
50+ empty : true
51+ message : Feature list changes
52+
53+ - type : checkout
54+ branch-name : main
55+ - type : branch
56+ branch-name : development
57+ - type : commit
58+ empty : true
59+ message : Commit on development
60+ - type : merge
61+ branch-name : feature-search
62+ no-ff : true
63+ - type : bash
64+ runs : |
65+ # Controlling everything through Bash to simplify workflow
66+ (git merge feature-delete || true) > /dev/null
67+ echo 'New contents' > conflict.txt
68+ git add conflict.txt
69+ (git commit --no-edit) > /dev/null
70+
71+ - type : new-file
72+ filename : features.md
73+ contents : |
74+ # Features
75+
76+ ## Searching for Books
77+
78+ Allows searching for books by keywords.
79+ Works only for book titles.
80+
81+ ## Create Book
82+
83+ Allows creating one book at a time.
84+
85+
86+ ## Deleting Books
87+
88+ Allows deleting books.
Original file line number Diff line number Diff line change 1+ initialization :
2+ steps :
3+ - type : commit
4+ empty : true
5+ message : Empty commit
6+ id : start
7+ - type : new-file
8+ filename : conflict.txt
9+ contents : |
10+ Hello world
11+ - type : add
12+ files :
13+ - conflict.txt
14+ - type : commit
15+ message : Expected branch point
16+ - type : tag
17+ tag-name : v1.0
18+
19+ - type : branch
20+ branch-name : feature-search
21+ - type : edit-file
22+ filename : conflict.txt
23+ contents : |
24+ Hello world!
25+ - type : add
26+ files :
27+ - conflict.txt
28+ - type : commit
29+ message : Feature search changes
30+ - type : checkout
31+ branch-name : main
32+
33+ - type : branch
34+ branch-name : feature-delete
35+ - type : edit-file
36+ filename : conflict.txt
37+ contents : |
38+ Hello world?
39+ - type : add
40+ files :
41+ - conflict.txt
42+ - type : commit
43+ message : Feature delete changes
44+ - type : checkout
45+ branch-name : main
46+
47+ - type : branch
48+ branch-name : other-list
49+ - type : commit
50+ empty : true
51+ message : Feature list changes
52+
53+ - type : checkout
54+ branch-name : main
55+ - type : branch
56+ branch-name : development
57+ - type : commit
58+ empty : true
59+ message : Commit on development
60+ - type : merge
61+ branch-name : feature-search
62+ no-ff : true
63+ - type : bash
64+ runs : |
65+ # Controlling everything through Bash to simplify workflow
66+ (git merge feature-delete || true) > /dev/null
67+ echo 'New contents' > conflict.txt
68+ git add conflict.txt
69+ (git commit --no-edit) > /dev/null
70+
71+ - type : new-file
72+ filename : features.md
73+ contents : |
74+ # Features
75+
76+ ## Create Book
77+
78+ Allows creating one book at a time.
79+
80+ ## Searching for Books
81+
82+ Allows searching for books by keywords.
83+ Works only for book titles.
84+
85+ ## Deleting Books
86+
87+ Allows deleting books.
Original file line number Diff line number Diff line change 1+ initialization :
2+ steps :
3+ - type : commit
4+ empty : true
5+ message : Empty commit
6+ id : start
7+ - type : new-file
8+ filename : conflict.txt
9+ contents : |
10+ Hello world
11+ - type : add
12+ files :
13+ - conflict.txt
14+ - type : commit
15+ message : Expected branch point
16+ - type : tag
17+ tag-name : v1.0
18+
19+ - type : branch
20+ branch-name : feature-search
21+ - type : edit-file
22+ filename : conflict.txt
23+ contents : |
24+ Hello world!
25+ - type : add
26+ files :
27+ - conflict.txt
28+ - type : commit
29+ message : Feature search changes
30+ - type : checkout
31+ branch-name : main
32+
33+ - type : branch
34+ branch-name : feature-delete
35+ - type : edit-file
36+ filename : conflict.txt
37+ contents : |
38+ Hello world?
39+ - type : add
40+ files :
41+ - conflict.txt
42+ - type : commit
43+ message : Feature delete changes
44+ - type : checkout
45+ branch-name : main
46+
47+ - type : branch
48+ branch-name : list
49+ - type : commit
50+ empty : true
51+ message : Feature list changes
52+
53+ - type : checkout
54+ branch-name : main
55+ - type : branch
56+ branch-name : development
57+ - type : commit
58+ empty : true
59+ message : Commit on development
60+ - type : merge
61+ branch-name : feature-search
62+ no-ff : true
63+ - type : bash
64+ runs : |
65+ # Controlling everything through Bash to simplify workflow
66+ (git merge feature-delete || true) > /dev/null
67+ echo 'New contents' > conflict.txt
68+ git add conflict.txt
69+ (git commit --no-edit) > /dev/null
70+
71+ - type : new-file
72+ filename : features.md
73+ contents : |
74+ # Features
75+
76+ ## Create Book
77+
78+ Allows creating one book at a time.
79+
80+ ## Searching for Books
81+
82+ Allows searching for books by keywords.
83+ Works only for book titles.
84+
85+ ## Deleting Books
86+
87+ Allows deleting books.
File renamed without changes.
Original file line number Diff line number Diff line change 1+ initialization :
2+ steps :
3+ - type : commit
4+ empty : true
5+ message : Empty commit
6+ id : start
7+ - type : new-file
8+ filename : conflict.txt
9+ contents : |
10+ Hello world
11+ - type : add
12+ files :
13+ - conflict.txt
14+ - type : commit
15+ message : Expected branch point
16+ - type : tag
17+ tag-name : v1.0
18+
19+ - type : branch
20+ branch-name : feature-search
21+ - type : edit-file
22+ filename : conflict.txt
23+ contents : |
24+ Hello world!
25+ - type : add
26+ files :
27+ - conflict.txt
28+ - type : commit
29+ message : Feature search changes
30+ - type : checkout
31+ branch-name : main
32+
33+ - type : branch
34+ branch-name : feature-delete
35+ - type : edit-file
36+ filename : conflict.txt
37+ contents : |
38+ Hello world?
39+ - type : add
40+ files :
41+ - conflict.txt
42+ - type : commit
43+ message : Feature delete changes
44+ - type : checkout
45+ branch-name : main
46+
47+ - type : branch
48+ branch-name : feature-list
49+ - type : commit
50+ empty : true
51+ message : Feature list changes
52+
53+ - type : checkout
54+ branch-name : main
55+ - type : branch
56+ branch-name : development
57+ - type : commit
58+ empty : true
59+ message : Commit on development
60+ - type : merge
61+ branch-name : feature-search
62+ no-ff : true
63+
64+ - type : new-file
65+ filename : features.md
66+ contents : |
67+ # Features
68+
69+ ## Create Book
70+
71+ Allows creating one book at a time.
72+
73+ ## Searching for Books
74+
75+ Allows searching for books by keywords.
76+ Works only for book titles.
77+
78+ ## Deleting Books
79+
80+ Allows deleting books.
You can’t perform that action at this time.
0 commit comments