visual studio - Strategy for unshelving large shelveset that is also old -

-

i spent couple months creating single large shelveset. shelved couple months ago. want merge mainline.

the base of shelveset 4 months old, , mainline has marched forward during time.

is there known strategy dealing mess?

find point in time "a couple of months" ago , create branch that. unshelve changes branch. commit changes, merge branch trunk. may have baseless merge; i'm not sure off top of head.

in future, don't use shelvesets since not intended used replacement branches. shelvesets intended allow short-term suspension of work in progress.


Comments

Post a Comment

Popular posts from this blog

c - Calling a function within a loop -

-
i trying simple addition function take number x array , add variable i it, iteration variable inside loop. instead of adding each variable individually , producing output of : 3, 2, 7 it produces values of 3, 5, 13. #include <stdio.h> int add(int x[], int y); int main(void) { int i; int a[3] = {3, 1, 5}; for(i=0; i<3; i++) { printf("%d \t", i); printf("%d, %d, equals %d \n", a[i], i, add(a[i], i)); } return 0; } int add(int x[], int y){ return x+y; } try int add(int x, int y){ return x+y; }
Read more

vb.net - Unbound DataGridView add row with checkbox error -

-
this windows forms program. have unbound datagridview control 4 columns; feature id string, parts string, flats string , showonest boolean. columns defined in form designer , boolean column is, indeed, set checkbox tristate set false. the user selects product list box , code executed populate grid grdfeat.rows.clear() = 0 curproduct.lstfeatures.count - 1 (curproduct.lstfeatures(i)) grdfeat.rows.add(.featureid, .parts, .flats, .showonest) end next if allowusertoaddrows false, everthing good. setting allowusertoaddrows true, however, results in following error: formatexception value '' cannot converted type 'boolean'. the error not triggered in code. it's displayed in new tab titled "no source available". it seems pretty clear process adds new editing row trying set checkbox string value, or perhaps null. i'm new (a few months) vb.net, suspect i'm overlooking simple setting somewhere, after several hours of trying...
Read more

How i fill combobox items in Radgridview manually using in vb.net -

-
how fill combobox items in radgridview manually without using datasource in vb.net have radgridview in form.(radgridview1) radgridview1 contained 3 column , column number 3 combobox type. want fill each combobox in column 3 data using code: unp ipe angle box other profile. don't know how it. you can use gridtemplatecolumn following. <telerik:gridtemplatecolumn itemstyle-wrap="true" itemstyle-verticalalign="middle" itemstyle-horizontalalign="center" allowfiltering="false" headerstyle-horizontalalign="center" headerstyle-width="3%" itemstyle-width="3%" headertext="profile"> <itemtemplate> <telerik:radcombobox> <items> <telerik:radcomboboxitem text="unp" value="unp" /> ...
Read more