version control - How to adapt this MKS Source Integrity workflow to Git? -

-


version control - How to adapt this MKS Source Integrity workflow to Git? -

please consider next case :

currently using mks source integrity (yes, hurts). twice week, developers check in feature (or part of it) development branch. check-ins 1 feature intertwined check-ins of other features. example: rev 1, 3, 5 feature a, rev 2 feature b, rev 4 feature c. once week, validated features checked in production branch. most requires merge out changes non-validated features. example: feature (from above) goes production, not feature b , c, wan't take rev 1, 3, 5 (discard 2 , 4), also, rev 3 might have required merge changes rev 2 when went in development; merge undone.

moving git (yay!). workflow respect constraint?

i have read lot it, , every workflow seems based on assumption @ time t, feature a, b, , c done. if not, guess t delayed.

in case, there no rush finishing features in time, ever. each developer works on 1 or several features. if it's ready, goes production. if it's not, maintain refining. every week, production build happens. extremely rarely, there no new code changes going production, it's built anyways. dozen features go in production.

hope it's clear enough. allow me know if need more details!

(edit) workflow considered:

work on feature in private branch push first time development, 1 single commit continue work in private branch push more changes development, still 1 single commit feature ready production; merge private branch production branch

rebase workflow:

at step 2, private branch rebased on latest development head, before push. doing so, happen when rebasing 1 time again @ step 4? changes first rebase, part of development, stripped out of newly rebased private branch, wouldn't they? create problem when going in production.

merge workflow:

at step 2, private branch merged latest development head;

the merge commit discarded in private branch, keeping private branch untouched happens in development branch. doing so, 1 have same merges 1 time again , again, every time checked in development.

the merge commit kept, , pushing development require merge new since lastly check-in. when going production, private branch carry changes other features. cherry-picking used pick relevant alter sets, require developer manually decide check-ins go , prone errors.

i set each feature it's own branch (taking total advantage of git's lite weight branches). 1 time feature ready, master can merged feature branch, feature can verified, branch can merged master (or production, or whatever :)).

the other add-on utilize here, have developers force own remote repo's, , have 1 person in charge of pulling changes developer's remote repo's main "blessed" repository. helps maintain command , "purity" of blessed repository.

git version-control

Comments

Post a Comment

Popular posts from this blog

How do I check if an insert was successful with MySQLdb in Python? -

-
How do I check if an insert was successful with MySQLdb in Python? - i have code: cursor = conn.cursor() cursor.execute(("insert new_files (videos_id, filename, " "is_processing) values (%s,%s,1)"), (id, filename)) logging.warn("%d", cursor.rowcount) if (cursor.rowcount == 1): logging.info("inserted values %d, %s", id, filename) else: logging.warn("failed insert values %d, %s", id, filename) cursor.close() fun is, cursor.rowcount always one, though updated database create videos_id unique key. is, insert fails because in tests same videos_id going appear (and when check database, nil inserted). whatever reason, rowcount 1 - logging.warn have spits out rowcount of 1. so, question: can utilize rowcount work out if insert went fine? if so, (presumably) doing wrong? otherwise, how check if insert went fine? your code not commit after modifications (your modifications rolled back). should...
Read more

delphi - blogger via idHTTP : error 400 bad request -

-
delphi - blogger via idHTTP : error 400 bad request - i'm trying post blogger using idhttp component, however, i'm getting "http/1.0 400 bad request" error. procedure tform1.button1click(sender: tobject); var request,response,req : tstringlist; auth,blogid : string; begin blogid := '00000000000000000000000'; request := tstringlist.create; response := tstringlist.create; req := tstringlist.create; idhttp1.request.connection := 'keep-alive'; idhttp1.request.contenttype := 'application/x-www-form-urlencoded'; idssliohandlersocket1.ssloptions.method := sslvsslv23; request.clear(); request.values['accounttype'] := 'google'; request.values['email'] := 'xxx@gmail.com'; request.values['passwd'] := 'yyy'; request.values['service'] := 'blogger'; response.text :=idhttp1.post('https://www.google.com/accounts/clientlogin',request); auth := resp...
Read more

postgresql - ERROR: operator is not unique: unknown + unknown -

-
postgresql - ERROR: operator is not unique: unknown + unknown - i have postgis database , have compute new values rows in new column. these values should average of values of several columns. query: insert bdps (da_m) values (avg('da_1'+'da_2'+'da_3'+'da_4'+'da_5'+'da_6'+'da_7')); in query bdps database, da_m new column , da_1 da_7 existing columns have double precision type. da_m created using alter table bdps add together column da_m double precision; i next error: error: operator not unique: unknown + unknown line 2: values (avg('da_1'+'da_2'+'da_3'+'da_4'+'da_5'+'da_6'+'da_7... ^ hint: not take best candidate operator. might need add together explicit type casts. ********** error ********** error: operator not unique: unknown + unknown sql state: 42725 hint: not take best candidate operator. might need add togethe...
Read more