Skip to content

Commit 01b2ec3

Browse files
authoredJan 29, 2019
Update README.md
1 parent 46192c8 commit 01b2ec3

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed
 

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Note - All changes shall be associated to a feature issue or a problem report is
2323
## How to handle merging
2424
I would recommend using [Gitlab Flow](https://docs.gitlab.com/ee/workflow/gitlab_flow.html) branching mechanism. This uses a branch, do development, merge changes back into mainline. When it comes to needing releases, then we would create release branches. They call this pre-production branch, and production branch which would be a branch off pre-production.
2525

26-
Ideally feature branches wouldn’t be merged into the mainline until ready but since our teams are broken up into functional teams there are dependencies. That would mean 3 different process to accomplish integrated features
26+
Ideally feature branches wouldn’t be merged into the mainline until ready but since our teams are broken up into functional teams there are dependencies. That would mean a few different process to accomplish integrated features
2727
1. Functional teams that have feature branches would need to sync between their branches to insure proper integration. Once integration is done N teams would merge their branches into the master/trunk
2828
1. Functional teams merge to master/trunk, do the integration and when they find problems on their side then updates would happen on their feature branch and remerge with master/trunk
2929
1. Functional teams merge what they have to master/trunk and then re-branch to handle integration changes

0 commit comments

Comments
 (0)