Skip to content

Commit 3e9d966

Browse files
committed
Continuing the conversion
1 parent e4d696a commit 3e9d966

File tree

2 files changed

+1
-32
lines changed

2 files changed

+1
-32
lines changed

docs/branches.md

Lines changed: 1 addition & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -79,24 +79,15 @@ Branches are used to create another line of development. They are "individual p
7979

8080
---
8181

82-
<!-- .slide: data-background="#ffffff" -->
83-
84-
<!-- .slide: style="font-size: 32px;" -->
85-
8682
Usually, a branch is created to work on a new feature. Once the feature is completed, it is merged back with the master branch.
8783

8884

89-
![](https://i.imgur.com/9Y4ymjG.png)
90-
85+
![Git several branches and new features](../images/git-several-branches-new-feature.png)
9186

9287
---
9388

94-
<!-- .slide: data-background="#ffffff" -->
95-
9689
## Branches: Creation
9790

98-
<!-- .slide: style="font-size: 36px;" -->
99-
10091
Creating a new branch does not change the repository, it just adds a new reference to the commit.
10192

10293
Note that the branch is created from the current HEAD.
@@ -109,10 +100,6 @@ $ git branch cool-feature
109100

110101
---
111102

112-
<!-- .slide: data-background="#ffffff" -->
113-
114-
<!-- .slide: style="font-size: 36px;" -->
115-
116103
To move to another branch (switch):
117104

118105
```shell
@@ -131,15 +118,10 @@ To see which branch you are on:
131118
$ git branch
132119
```
133120

134-
135121
---
136122

137-
<!-- .slide: data-background="#ffffff" -->
138-
139123
## Branches: merging, deletion
140124

141-
<!-- .slide: style="font-size: 30px;" -->
142-
143125
- When you have decided you are happy with the changes you made to the new branch, merge it back to the master branch (or another branch)
144126
- Note: The branch is always merged to the current HEAD.
145127
- First switch to the branch you are merging it to:
@@ -159,12 +141,8 @@ $ git branch -d cool-feature
159141

160142
---
161143

162-
<!-- .slide: data-background="#ffffff" -->
163-
164144
### Example - Type along if you wish
165145

166-
<!-- .slide: style="font-size: 32px;" -->
167-
168146
* Create a directory. Initialize a repository
169147
* Create a file, stage it, and commit it
170148

@@ -180,13 +158,8 @@ $ git commit -m "Committing the first file"
180158
create mode 100644 file.txt
181159
```
182160

183-
184161
---
185162

186-
<!-- .slide: data-background="#ffffff" -->
187-
188-
<!-- .slide: style="font-size: 32px;" -->
189-
190163
* Create a new branch, then switch to that branch
191164
* Make some changes - add files and text ( > overwrites or are suitable for new file)
192165
* Stage the file and commit it
@@ -203,10 +176,6 @@ $ git commit -m "Added text to the first file"
203176

204177
---
205178

206-
<!-- .slide: data-background="#ffffff" -->
207-
208-
<!-- .slide: style="font-size: 30px;" -->
209-
210179
- Switch back to the master branch, make some changes
211180
```shell
212181
$ git checkout master
9.33 KB
Loading

0 commit comments

Comments
 (0)