merge - Git consistently merging one file incorrectly -


i'm having weird issue git's merge feature i've never seen before. merging changes branch master , git seems consistently having trouble 1 particular file.

it's merging content seemingly random places. it's happened last few times file has been merged.

here changes made myfile.cs on other branch (called somebranch):

-                service.updateuser(user); +                service.updateuser(user, false); ... -                user[] users = client.importpersonnel(a, b, c); +                userimportresults results = client.importpersonnel(a, b, c); ... -                response.write(jsonconvert.serializeobject(new { usercount = users.length })); +                response.write(jsonconvert.serializeobject(new { added = results.numadded, updated = results.numupdated }));

just few lines of code.

so did this:

git merge somebranch master

most of merged without conflicts. few files have conflicts make sense. automerge changes made myfile.cs strange. example, line

service.updateuser(user, false);

was stuck in random place in middle of master version of myfile.cs:

                if (request["x"] != null)                 {                     calculatesomething(request["x"]);                 }  <<<<<<< head                 if (request["y"] != null)                 {                     calculatesomething(request["y"]);                 } =======             try             {                 client.updateuser(user, false); >>>>>>> qaqc-release                  if (request["z"] != null)                 {                     calculatesomething(request["z"]);                 }

i'm not sure how git determines how merge 2 files haven't seen before. , happens 1 file.

the place should merging change in , place it's doing little on 100 lines apart. however, file 5000 lines long relatively speaking it's not far off still it's odd.

any ideas why happening or can it? often-touched file it's going merged. it's never been issue in last year or of development i'm not sure changed great address it.

two things check:

  • since oft-merged file, perhaps there incorrect merge performed , backed out in past, that's been recorded git rerere. maybe in meta-data there if have enabled?
  • your code formatting may throwing things off. if file has many places can match beginning of patch, 1 that's adding new lines, see getting confused if doesn't consider enough context. maybe there's flag git merge tell @ broader range of context default, prevent mistaken matches?

Comments

Post a Comment

Popular posts from this blog

c# - Validate object ID from GET to POST -

i have method allows user access comment have made on site. have post method lets them update comment. my normal solution send entire comment model through, let them update it, update on database when post back. involve sending commentid through in hiddenfor , can manipulated. how can verify commentid sent in get method same i'm getting in post , not able alter comment wish? how can verify commentid sent in method same i'm getting in post? basically have validate following things in post - user logged-in user. authenticated users post comments. commentid in post , should valid commentid , should present in database. userid associated logged-in user should same userid associated comment . comment should contain userid column, can check @ time of update. to make sure update happens comment has been sent in get - hold commentid in session , in post action compare commentid value in session .
Read more

node.js - Custom Model Validator SailsJS -

when using custom model validator checks record within model. return within spread doesn't seem end control flow. //post.js model /** * custom validator **/ types: { isuservalid: function(user_id) { var promise = require('bluebird'); promise.all([ user.findone({id: user_id}) ]) .spread(function(user) { console.log(user); if (user === null || user === undefined) { console.log('failed'); return false; }else{ console.log('passed'); return true; } }); } }, my response standard validation failed response. { "error": "e_validation", "status": 400, "summary": "1 attribute invalid", "model": "post", "invalidattributes": { "owner": [ { "rule": "isuservalid", ...
Read more

php - Find a regex to take part of Email -

i have following emails need extract part from: bestellnummer xxx: 1 von xxx, 1er pack ------------- anfang der nachricht ------------- foo bar baz foo bar baz // <<<<< need text here ------------- ende der nachricht ------------- ------------- anfang der nachricht ------------- foo bar baz foo bar baz ------------- ende der nachricht ------------- there 0 unlimited occurences of ------------- anfang der nachricht ------------- ------------- ende der nachricht ------------- and i'm able extract first part regex: $re = "/------------- .*? -------------.?(.*?).?------------- .*? -------------/s"; but, i'm quite new on learning regex, i'm pretty sure there must better regex extract part (foo bar baz foo bar baz) of text between ------------- anfang der nachricht ------------- ------------- ende der nachricht ------------- as can in different languages, i'm using .? to match between hyphens. i...
Read more