"Multichannel" development using git -

-

i'm developing app windows phone, using sdk version 7.1 (for wp7) , hosting in git repo. in order make available on windows phone 8 devices higher resolutions, created branch wp8 converted visual studio project , made necessary code adjustments.

now continue developing on master, update functionality-related changes wp8 branch. first thought merge branches, fear 2 possible problems:

  1. when using merge, 1 branch disappear. (not true)
  2. firmware-related changes (wp7 → wp8) might overridden.

is there proper way in git develop several different (but similar) target sdks depend on big amount of identical code?

when using merge, 1 branch disappear.

no, no branch disappear

firmware-related changes (wp7 → wp8) might overridden

first, try rather rebase wp8 on top of master.
is, try apply wp8 on top of master (see merge vs. rebase).
gary fixler comments below, makes sense branches short history (otherwise, re-applying old commits on top of recent work can troublesome, , history wouldn't make sense).

i bring rebase, because considered bad practice merge master other branch (this called "back merge", , makes adam dymitruk angry;)).

you should use feature branches, can merge master, and wp8 branch.
takes advantage of ease of branching offered git, , leave master stable state of code: further evolution master should done in feature branch (and merged to master), instead of being done in master (resulting in "back merge" master branch, bad practice)

see more on adam's article "branch per feature".

regarding configuration files, can store values in separates files, , use template file build right config file right values, depending on branch are.
see "what's easiest way deal project configuration files?".

that way, want have merge issue files different content in different branches, because values stored in different files.


Comments

Post a Comment

Popular posts from this blog

Perl - how to grep a block of text from a file -

-
it can in xml or text format. how in general grep block of text in perl? <track type="ws"> <range> <rangestart>0</rangestart> <rangeend>146.912</rangeend> <locationindex>0</locationindex> <propertyindex>0</propertyindex> </range> </track> <track type="ps" id="1"> <range> <rangestart>0</rangestart> <rangeend>146.912</rangeend> <locationindex>1</locationindex> <propertyindex>1</propertyindex> </range> </track> i want grep type="ps" , till </range> . one solution open file, read line line , match block. open(fh, "file.txt"); foreach $line (<fh>) { if ($line =~ m/type="cc"(.*?)<\/range>/) { print $1; } } but there more optimal solution without reading file line l
Read more

delphi - How to remove all the grips on a coolbar if I have several coolbands? -

-
Image
if set mycoolbar.fixedorder true,only grip on first band hidden. well,if use delphi 7 create vcl forms application,then put coolbar on , create 3 coolbans hold other controls,only grip , top coolbands can hidden setting mycoolbar.fixedorder:=true. i've uploaded picture make things clear. you got fixedorder property wrong. fixed property not allow bands rearranged if set true . setting property of coolbar true keep user changing bands order @ runtime, user can still move , resize bands. can give advice can do, actual solution problem, well, have wait answer. my advice use 3 coolbars in row , setting "fixedorder" property true , bandborderstyle bsnone . way grip hidden on of them. about property, it's not bug of ide, actual preference of property.
Read more

javascript - Animating array of divs; only the final element is modified -

-
this baffling me @ moment. i'm experienced programmer looking throw bit of surprise fiancee on countdown page our wedding. desired effect simulated confetti falling behind main page. setup follows: i have array of divs in javascript. each div absolutely positioned on page. have interval set updates every 50 or milliseconds. on each tick, run loop on array of divs, , calculations , update positions. problem problem having, however, though can see divs created, stored array, , modified (in case, each has slight randomized rotation) during initialization phase, once tick update position starts, div stored in whatever last slot of array gets position updated. tried hard-coding each div index testing purposes, strictly last element update position. upon printing current "left" , "top" style values each div before , after calculations shows value has been changed, no visible change noticeable. here's basic code: javascript var container;
Read more