-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy pathlesson_2_reflections.txt
48 lines (29 loc) · 1.67 KB
/
lesson_2_reflections.txt
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
41
42
43
44
45
46
47
48
What happens when you initialize a repository? Why do you need to do it?
It turns an ordinary directory into a git repository. We do this so we can
begin using git to track our file history.
How is the staging area different from the working directory and the repository?
What value do you think it offers?
The staging area is where we build up a group of files from our working
directory to be committed to the repository. It helps the work of version
control by giving us an area to work on our commit in several steps. Without
the staging area, a commit would be more difficult to create logical commits
involving more than one file.
How can you use the staging area to make sure you have one commit per logical
change?
Before committing, check the staged changes to make sure they belong together.
What are some situations when branches would be helpful in keeping your history
organized? How would branches help?
When you have more than one track of development, branches can help keep the
different tracks separated and prevent any problems with one branch from
complicating the other.
How do the diagrams help you visualize the branch structure?
They make a spatial representation of the relationship between commits.
What is the result of merging two branches together? Why do we represent it
in the diagram the way we do?
Merging combines two branches into one. The merged commit points to both of its
parent commits.
What are the pros and cons of Git's automatic merging vs. always doing merges
manually?
Git can merge automatically when there are no conflicting changes, which saves
a lot of time over manual merging. It's still possible for a merged file to have
problems, though.