-
Notifications
You must be signed in to change notification settings - Fork 0
/
lesson_2_reflection_prompts.txt
45 lines (30 loc) · 2.05 KB
/
lesson_2_reflection_prompts.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
What happens when you initialize a repository? Why do you need to do it?
A .git directory will be created. We need init command to make working directory in to a git repository recording the different versions of file.
How is the staging area different from the working directory and the repository?
What value do you think it offers?
Staging area acts as an intermediate between the working directory and the actul repository.We can include the file/files in staging area by grouping them so as to make a commit for each logical step.
How can you use the staging area to make sure you have one commit per logical
change?
Staging area can be used in way such that all files that represent a logical change should be staged by using 'git add file' command and then make commit with a message
What are some situations when branches would be helpful in keeping your history
organized? How would branches help?
When we need to perform some experimental changes or unique features that we are not confident.Branches can help us to add experimental changes to repository publicly so that if succeeded we can merge it with master branch/ we can ignore it on failure without making changes to previous version.
How do the diagrams help you visualize the branch structure?
Help to know the history from Tail to HEAD for each branches as well as find the info about unreachable commit id(detached head)
What is the result of merging two branches together? Why do we represent it in
the diagram the way we do?
The result of merging two branches will create a commit logs in the order of timestamp along with the change made in both the branches by combining one branch to another along with its features that are working properly.
What are the pros and cons of Git's automatic merging vs. always doing merges
manually?
Automatic merging:
pros
easy
single step
cons
Arises merge conflicts which will be resolved manually
Manual merging:
pros
help in merging the files that are logically same( have changes in naming)
help to cross check the correctness of code
cons
Takes time