forked from yugandhar111/gitcode
-
Notifications
You must be signed in to change notification settings - Fork 0
Expand file tree
/
Copy pathgitcommand4
More file actions
85 lines (68 loc) · 1.95 KB
/
gitcommand4
File metadata and controls
85 lines (68 loc) · 1.95 KB
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
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
git checkout -b master
3 git checkout -b develop master
4
5 Creating a feature branch
6 git checkout -b myfeature develop
7 [Implement Feature, add to Stage, Commit, Push to Feature branch]
8 git checkout develop
9 git merge --no-ff myfeature. [ --no-ff, to rack all merge commit]
10 [Merge conflit, resolve manually, add to Stage, Commit, Push to Feature branch]
11 git branch -d myfeature
12 git push origin develop
13
14
15 Creating a release branch
16 git checkout -b release-1.2 develop
17 echo "Released feature 1.2" >>change.txt
18 git add change.txt
19 git commit -a -m "Bumped version number to 1.2"
20
21
22 Finishing a release branch
23 git checkout master
24 git merge --no-ff release-1.2
25 git tag -a 1.2
26
27 git checkout develop
28 git merge --no-ff release-1.2
29 git branch -d release-1.2
30
31
32 Creating the hotfix branch
33 git checkout -b hotfix-1.2.1 master
34 echo "Released bug 1.2" >>change.txt
35 git add change.txt
36 git commit -a -m "Bumped version number to 1.2.1"
37 <fix bug>
38 git commit -m "Fixed severe production problem"
39
40 Finishing a hotfix branch
41 git checkout master
42 git merge --no-ff hotfix-1.2.1
43 git tag -a 1.2.1
44
45 git checkout develop
46 git merge --no-ff hotfix-1.2.1
47 git branch -d hotfix-1.2.1
Open this file in GitHub Desktop You must be signed in to make or propose changes You must be signed in to make or propose changes
1 BitBucket Gui [https://bitbucket.org/]
2 - repo creation
3 - add file
4 - pull
5 - branching
6 - create Pull request
7 - Branch model
8 - CI/CD Pipeline
9 - Development
10 - Create User
11 - Create Group
12 - Permission
13 - Web hock
14
15 Gitlab [gitlab.com]
16
17 SVN migration:
18 https://git-scm.com/book/en/v2/Git-and-Other-Systems-Migrating-to-Git
19
20 Intellij Download
21 https://www.jetbrains.com/idea/download/#section=mac