bash - Git: merge hides certain changes -

-

we work through visual studio 2015 git. have had central repository (gitlab) single branch 'master'. 2 people have cloned repository.

  1. first guy have added "test-new-file-v.txt" file in solution. have changed solution file (.sln) , have changed string "visualstudioversion = 14.0.23107.0". commit in local repository , push commit in central repository (gitlab). after that, have watched commit in central repository (gitlab): enter image description here

  2. second guy have added "testgit.txt" file in solution. have changed solution file (.sln) too, didn`t change string visualstudioversion. want pull central repository (gitlab) before push.

  3. second guy has had conflict. merge through visual studio 2015 , see different guy have made mistake in changing "visualstudioversion = 14.0.24720.0" on "visualstudioversion = 14.0.23107.0". second guy want leave string "visualstudioversion = 14.0.24720.0" unchanged. chose local state "visualstudioversion = 14.0.24720.0" string , make commit merge. after push 2 commits in central repository (gitlab).
  4. after that, have watched history , changes in central repository (gitlab) , have seen commit merge second guy: enter image description here

we see in central repository (gitlab) solution file contains string "visualstudioversion = 14.0.24720.0" , correct, don`t see string replace string "visualstudioversion = 14.0.23107.0", because commit first guy contains string , before merge commit.

my questions:

  1. is correct behaviour? expect see in merge commit string "visualstudioversion = 14.0.23107.0" changed "visualstudioversion = 14.0.24720.0".
  2. how can achieve behaviour in can see changes?

  1. i assuming didn't changes before commit on master branch, locally may not have change pushed. prevents code being reverted if branch out of date.

  2. i suggest not committing changes master. create separate local branch , use pull requests master.

look using git branching strategy keep branches orderly.

git branching model


Comments

Post a Comment

Popular posts from this blog

sql - VB.NET Operand type clash: date is incompatible with int error -

-
i trying display records table named staffpresentee database using clause... i using visual studio 2010... the table design follows- .......fieldname..................datatype........allownull 1......staff_id (fk).............numeric(18,0)......yes 2.......date........................date.............no 3......present.....................char(1)..........yes note type of 2nd field date , not datetime... i want display records table have today's date int 'date' field... current query is- cmd = new sqlclient.sqlcommand("select * staffpresentee date=" & date.now.date, cn) dr = cmd.executereader for dr = cmd.executereader error "operand type clash: date incompatible int" i tried select * staffpresentee query without clause runs correctly. try putting date value in sigle quotes maybe. cmd = new sqlclient.sqlcommand("select * staffpresentee date='" & _
Read more

SVG stroke-linecap doesn't work for circles in Firefox? -

-
i've got problem svg stroke-linecap attribute. i've got circular progress bar in angularjs , set outer circle (blue one) have rounded "ends". @ fiddle . <svg ... height="130" width="130"> <!-- ngif: background --> <circle ... ng-if="background" fill="#fff" class="ng-scope" stroke-width="13" stroke="#cc3399" r="57.5" cy="65" cx="65" stroke-linecap="round" /> <!-- end ngif: background --> <circle ... fill="none" stroke-dashoffset="36.12831551628261" stroke-dasharray="361.28315516282623" stroke-width="13" stroke="#432db3" stroke-linecap="round" r="57.5" cy="65" cx="65" transform="rotate(-89.9, 65, 65)" /> </svg> how can that?
Read more

python - TypeError: Scalar value for argument 'color' is not numeric in openCV -

-
here code im = cv2.imread('luffy.jpg') gray = cv2.cvtcolor(im,cv2.color_bgr2gray) ret,thresh = cv2.threshold(gray,127,255,0) contours,h = cv2.findcontours(thresh,cv2.retr_tree,cv2.chain_approx_simple) cnt in contours: moment = cv2.moments(cnt) c_y = moment['m10']/(moment['m00']+0.01) c_x = moment['m01']/(moment['m00']+0.01) centroid_color = im[c_x,c_y] centroid_color = np.array((centroid_color[0],centroid_color[1],centroid_color[2])) print type(centroid_color) cv2.fillpoly(im,cnt,centroid_color) i getting error on last line try , pass centroid_color color argument. <type 'numpy.ndarray'> , have been able pass data type cv2.fillpoly color in other instances, not sure why having problem here. fillpoly() expects iterable, i.e. put cnt in brackets. believe duplicate of https://stackoverflow.com/a/17582850/5818240 . moreover, centroid color variable contains strings. need convert them i
Read more