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

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

routes - Laravel 4 Wildcard Routing to Different Controllers -

-
realizing i'm going take beating this, have several questions "best practices" when constructing laravel route. do laravel routes run "first come first serve" top bottom? if route found, pass control controller (or perform action) , terminate? i have part of application acts url shortner. so, route looks this: route::get('/{id}', array('as' => 'home.text', 'uses' => 'homecontroller@text'), function($id){ //make sure id exists before pushing controller. if (storage::where('shortcode','=', $id)->count() > 0) { // route found } }); how can improved? one, i'm not sure how pass processing on controller conditionally.. sort of controller::make() ..? 3) there better way in laravel check if record exists versus doing mode::where('column','=','value')->count() 4) have legacy urls http://url.com/?...
Read more

cross browser - XSLT namespace-alias Not Working in Firefox or Chrome -

-
i transforming xhtml xhtml, need xslt stylesheet part of resulting document (the stylesheet contained in <script type"text/template"> element. using the xsl:namespace-alias instruction, works fine in ie, fails in both chrome , firefox. here relevant code: <xsl:output doctype-system="about:legacy-compat" omit-xml-declaration="yes" indent="yes" method="html" media-type="application/xhml" encoding="utf-8"/> <xsl:namespace-alias stylesheet-prefix="wxsl" result-prefix="xsl" /> <xsl:template match="head"> <!-- code omitted clarity --> <script type="text/template"> <wxsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/xsl/transform" xmlns="http://www.w3.org/1999/xhtml" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:eli="local"> ...
Read more