You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardExpand all lines: README.md
+8-8Lines changed: 8 additions & 8 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -1,4 +1,4 @@
1
-
.001.png)
1
+

2
2
FieldAssist
3
3
4
4
**VCS (Git) v2.0**
@@ -43,7 +43,7 @@ Drilling down and after brainstorming we came with our new Git Branching model w
43
43
1. Linear history would enable us to cherry pick commits easily.
44
44
1. With proper commit message/branch naming standards we can easily identify the purpose of commit and subsequent PR
45
45
46
-
**OVERVIEW OF NEW SYSTEM.002.png)**
46
+
**OVERVIEW OF NEW SYSTEM**
47
47
48
48
The new branching model is an enhanced version of [Git-flow](https://nvie.com/posts/a-successful-git-branching-model/) that tries to solve the previous diagnosed issues by defining different branches as below:
49
49
@@ -174,7 +174,7 @@ Pull request can be merged by admins in three ways (actually there are four, but
174
174
175
175
Hence all team members will use **Rebase and merge** option when merging PR of individual members into their respective team develop branch.
176
176
177
-
.007.png)
177
+

178
178
179
179
**BEST PRACTICES**
180
180
@@ -197,15 +197,15 @@ If we religiously follow the above pattern we would have a pretty organized stru
197
197
198
198
Looks awesome?
199
199
200
-
.009.png)
200
+

201
201
202
202
**Commit Message**
203
203
204
204
Proper commit message should be entered while committing your work. Your commit message should follow following standards:
205
205
206
206
1. Commit message should have a prefix indicating the feature/highlight of the nature of work in commit. For example:
207
207
208
-
.010.png)
208
+

209
209
210
210
This will clearly indicate what commit message corresponds to what feature/bug in commit history. Helpful after merge and releases are complete.
211
211
@@ -247,7 +247,7 @@ Every merge to either **develop** or **master** must have the latest commit as *
247
247
248
248
**Rebasing** is a process to reapply commits on top of another base trip. This must be done regularly or just before raising PR to the base branch.
249
249
250
-
.012.png)
250
+

251
251
252
252
In the above figure, the feature branch is no more with latest changes in master because some other members did work on master. Hence to have linear git history and prevent merge conflicts feature branch is **rebased on-to master** so as to make its commit appear **on top of the latest master.**
253
253
@@ -259,7 +259,7 @@ $ git rebase master // The branch on which you will raise PR
259
259
260
260
**ff (Fast forward) merge vs no-ff merge**
261
261
262
-
.014.png)
262
+

263
263
264
264
Feature branches can be merged in two ways. Either by **ff-merge** or by **--no-ff merge.** No ff merge would create **merge commit** while maintaining the history of merge. This is helpful when merging **hotfix branches** where merge history is required.
265
265
@@ -269,7 +269,7 @@ On the other hand, **ff merge** would simply merge the feature branch on-to mast
269
269
270
270
Sometimes code related or code review type discussions are needed with other members, hence often we add a prefix **WIP** to the title of PR. Such PR should not be merged as the work is still in progress. Once the WIP thing is over, the author of PR must remove the WIP prefix to get it reviewed & merged.
0 commit comments