-
Notifications
You must be signed in to change notification settings - Fork 0
/
git demo
68 lines (29 loc) · 1.1 KB
/
git demo
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
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
Project - 1:
Day - 1:
class -1 125 lines - no of users - 1
day - 2:
class -1
Class - 2
No of users -1
day - 3
no of users - 2
user - 1 - class file-1
user - 2, Class file - 2
Problem statement - Version issue??
Solution:
Master Branch Code - LIve code
user -1 pulls original version of the code - V1, [Create a branch - 1]
modfies code of class -1 file - V2
user -2 Pulls the original vesion of the code - v1 [Create a branch - 2]
modifies the class-2 file of the code - V3
Release day -
Approach one -:
branch2 code merged with branch-1 - then push the code to Master
Approach - 2:
Branch -1 merge the code with master branch - user -1 development completed and commited
user - 2:
pulls master code, then merge the branch2 with
**********************************************************************************************************
Github - remote code repo - it will have only your code and Proeprties file
git - versioncontrol management tool --->
Local system - folder ---> git ------> Repo