git - Best practice: Workflow: When to merge in a inhomogeneous team -


i'm technical manager of team of student-programmers applying scrum , using git.

we use following branching model: http://nvie.com/posts/a-successful-git-branching-model/

while i'm working half of week students program whenever suites best schedule/personal needs (also on weekends or late in evening).

now have different requirements (as see it) don't go together:

on 1 hand 1 has technical responsibility review code before gets development branch , able inspect code in regards existence of unit tests, adherence coding style , maintainability in general.

on other hand want team merge no merge conflicts arise (or @ least stay little possible.

  • is common problem - others have found proven solution?
  • do have special problem here? have idea how solve it?
  • do go wrong direction thinking - premises somehow false?

that can take advantage of distributed nature of git:

you can have them merge in dev branch of dedicated "qa" repo, in turn push final centralized repo if commit approved.

ideally, qa repo gerrit one, meant facilitate review process.

but general idea, dvcs, is: don't have merge workflow (merging branch branch), have publication workflow (pushing repo upstream repo).


Comments

Post a Comment

Popular posts from this blog

java.util.scanner - How to read and add only numbers to array from a text file -

i'm learning java , have question regarding reading file want read numbers file contains strings well. here example of file: 66.56 "3 java 3-43 5-42 2.1 1 and here coding: public class test { public static void main (string [] args){ if (0 < args.length) { file x = new file(args[0]); try{ scanner in = new scanner( new fileinputstream(x)); arraylist<double> test = new arraylist<>(); while(in.hasnext()){ if(in.hasnextdouble()){ double f=in.nextdouble(); test.add(f);} else {in.next();} } catch(ioexception e) { system.err.println("exception during reading: " + e); } } my problem add 66.56,2.1 , 1 doesn't add 3 after "3 or ignores 3-43 , 5-42 can tell me how skip strings , add doubles here? thanks all said 3 ie; "3, 3-43 , 4-42 strings either u read string , split , check number @ " , - or put in space between characters , integers. jvm after compilation tre...
Read more

rewrite - Trouble with Wordpress multiple custom querystrings -

i'm working on adding multiple querystring , doesn't seem work. i've found codes seems work others might i'm missing something. i want like: http://mydomain.com/board/?getyear=2013&getsometext2=sometext to http://mydomain.com/board/2013/sometext/ i added code below functions.php file. doesn't seem work should though. this works. echoing querystring gets both variable without problem. http://mydomain.com/board/2013/sometext/ but doesn't. tested querystring vis isset() seems nothing being set/get http://mydomain.com/board/2013/ function add_query_vars($vars) { $vars[] = "getyear"; $vars[] = "getsometext2"; return $vars; } add_filter('query_vars', 'add_query_vars'); function add_rewrite_rules($arules) { $anewrules = array('board/([^/]+)/([^/]+)/?$' => 'index.php?pagename=board&getyear=$matches[1]&getsometext2=$matches[2]'); $arules = $a...
Read more