version control - How sync work using git-flow -


i , co-worker working project. there --bare remote repo have cloned our pc. have both initialized own personal repos git-flow. have develop , master branch.

which branch shoult use sync work co-worker?

if not commit changes in feature branches, develop branch dirty , can't push sync. alternative use create new feature branch called "sync release" every time want sync work. closure of feature branch update master branch , can sync (not dirty develop branch).

this our current workflow. correct git structure when developer use git-flow , want share work correctly?

syncing develop branch best approach shields away unfinished features co-worker still working on.

if local develop branch dirty @ given moment, git stash can save away local work temporarily (and use git stash pop take out again after sync).

having said that, bear in git distributed system and, such, can both sync , work on feature in progress without going through “central” repo.

see example description in nvie’s original description of git-flow “decentralized centralized”:

nvie’s “decentralized centralized” illustration


Comments

Post a Comment

Popular posts from this blog

IF statement in MySQL trigger -

this query code in mysql trigger. if 1=2 select 'yes'; else select 'no'; end if; but has following error: if '1'='2' select 'yes' error code: 1064. have error in sql syntax; check manual corresponds mysql server version right syntax use near 'if '1'='2' select 'yes'' @ line 1 0.000 sec what solution?
Read more

c++ - What does MSC in "// appease MSC" comments mean? -

i run across // appease msc in c++ comments, e.g. here : const int& array::operator[](int offset) const { int mysize = getitssize(); if (offset >= 0 && offset < getitssize()) return ptype[offset]; throw xboundary(); return ptype[offset]; // appease msc! } what msc stand ? the author means microsoft's compiler, more formally known msvc.
Read more

javascript - Blogger related post gadget image Resize s72-c [ Need Expert Help ] -

i run blogger blog , use follow code javascript code (requires no jquery) show related post labels/categories of post. <script type='text/javascript'> var defaultnoimage=&quot;http://1.bp.blogspot.com/-m72rpguntq0/vuokijudn_i/aaaaaaaaboi/lq18sceunsg/w72/favicon-tik.png&quot;; var maxresults=16; var splittercolor=&quot;#d4eaf2&quot;; var relatedpoststitle=&quot;related posts&quot;; </script> <script type='text/javascript'>//<![cdata[ var relatedtitles = new array(); var relatedtitlesnum = 0; var relatedurls = new array(); var thumburl = new array(); function related_results_labels_thumbs(json) { (var = 0; < json.feed.entry.length; i++) { var entry = json.feed.entry[i]; relatedtitles[relatedtitlesnum] = entry.title.$t; try { thumburl[relatedtitlesnum] = entry.media$thumbnail.url } catch (error) {...
Read more