"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

c++ - Function signature as a function template parameter -

-
i'd use function signature template argument. works great classes, when try same trick function templates, msvc throws error: error c2768: 'func' : illegal use of explicit template arguments here's code: template <typename signature> void func(); template <typename r, typename a1> void func<r(a1)>(); what should make work? you cannot partially specialize function template, not supported language. can create partially specialized class template static member function, , possibly trampoline function instantiate class template , invoke static function. something this: namespace detail { template<typename signature> struct helper; template<typename r, typename a1> struct helper<r(a1)> { static void call() { // stuff r , a1... } }; } template<typename signature> void func() { detail::helper<signature>::call(); }
Read more

algorithm - What are some ways to combine a number of (potentially incompatible) sorted sub-sets of a total set into a (partial) ordering of the total set? -

-
i have sorting problem i'm pretty sure doesn't have canonical "answer" - has number of different approaches, each pros/cons. i'm interested in hearing different approaches. suppose bunch of people {p_i | i=1,...,m} ranking favorite ice cream flavors. in total there n different flavors, single person p_i ranks n_i << n flavors or familiar with. i'm interested in combining these sub-rankings plausible overall ranking of n flavors. for concrete situation: m , n both 1000 (by coincidence), , each n_i 20 . can assume there's enough overlap in flavors people rank such no flavor "isolated". again, i'm interested in hearing different ways approach this, if there isn't single clear answer. thanks! one way approach problem construct directed cyclic graph representing of constraints on ordering of elements. nodes in graph represent different elements compared , have edge first node second node if had ranked first e...
Read more

How to call a javascript function after the page loads with a chrome extension? -

-
there's function on page want call after loads. not own page, can't insert html it. can please provide specific examples how chrome extension or greasemonkey? (function submitaction() ). both chrome extensions , greasemonkey offer ways specify when script inject if executed. in chrome extension, you set in manifest : "content_scripts": [ { "run_at" : "document_idle", in greasemonkey compatible userscripts, set in metadata // @run-at document-end in both cases, have add script if want ensure resources loaded when function executed : document.addeventlistener('load', submitaction);
Read more