merge - Conflict when merging two branches with git -


i have problem merging 2 branches. have xml file following content:

<?xml version="1.0" encoding="utf-8"?> <language xmlns:xsi="http://www.w3.org/2001/xmlschema-instance" name="sk" xsi:nonamespaceschemalocation="language.xsd">   <topic name="topicname">     <section name="sectionname">       <pair key="key_1" state="0">value 1</pair>       <pair key="key_2" state="0">value 2</pair>     </section>   </topic> </language>

then following case:

the branch "master" changes @ xml file "state" "0" "1". i.e.

<?xml version="1.0" encoding="utf-8"?> <language xmlns:xsi="http://www.w3.org/2001/xmlschema-instance" name="sk" xsi:nonamespaceschemalocation="language.xsd">   <topic name="topicname">     <section name="sectionname">       <pair key="key_1" state="1">value 1</pair>       <pair key="key_2" state="1">value 2</pair>     </section>   </topic> </language>

the changes commited , pushed te cenral repository.

the branch "test" addes new node. i.e. :

<?xml version="1.0" encoding="utf-8"?> <language xmlns:xsi="http://www.w3.org/2001/xmlschema-instance" name="sk" xsi:nonamespaceschemalocation="language.xsd">   <topic name="topicname">     <section name="sectionname">       <pair key="key_1" state="0">value 1</pair>       <pair key="key_2" state="0">value 2</pair>       <pair key="key_3" state="0">value 3</pair>     </section>   </topic> </language>

the changes commited , pushed te cenral repository.

when merge "test" branch @ "master" branch conflict. i.e.

[master] git pull origin test

the conflicted file looks this:

<?xml version="1.0" encoding="utf-8"?> <language xmlns:xsi="http://www.w3.org/2001/xmlschema-instance" name="sk" xsi:nonamespaceschemalocation="language.xsd">   <topic name="topicname">     <section name="sectionname"> <<<<<<< head       <pair key="key_1" state="1">value 1</pair>       <pair key="key_2" state="1">value 2</pair> =======       <pair key="key_1" state="0">value 1</pair>       <pair key="key_2" state="0">value 2</pair>       <pair key="key_3" state="0">value 3</pair> >>>>>>> b872e7d1bbbe281482baefa73e322a34c475aa92     </section>   </topic> </language>

i don't understand why these kind of changes lead conflicts. can assure there no other changes on files, spaces, tabs or new lines. (i have reproduced kind of conflict many times)

when open conflicted file merge tool, shows no conflict. shows changes, , merge tool not automatically merge new line. (i use git version 1.7.10.4)

can explain why happens , how can avoid kind of conflicts.

thanks in advance.

edit: searching better merge-tools resolving git-conflicts. found kdiff3. when did command:

git mergetool --tool kdiff3 sk.xml

the tool did not show, did resolved conflict automatically. happy.

now questions:
1. why can not git this?
2. can "kdiff3" trusted, solved conflict good? checked manually type of conflict posted, , solved conflict good. there potentiall that, tool may merge files automatically unproperly?

while humans recognize 1st branch changed 0 character on each of pair of lines 1, diff/merge tools don't see things way. these programs line oriented.
2 lines deleted. 2 new lines inserted in there place. similarity irrelevant.

the 2nd branch inserts line, where? know it's before </section> line, 2 lines before cited deletion other branch. thing that's same <section ... > line.

a human might reasonably guess new key_3 line should inserted after 2 new key_1 & key_2 lines, there's no reasonable way programmaticly sure of that.

erring on side of caution not unreasonable.

avoiding require byte/character oriented diff tools, there prices too.


Comments

Post a Comment

Popular posts from this blog

Why does Ruby on Rails generate add a blank line to the end of a file? -

running rails generate controller foo home results in: class foocontroller < application controller def home end end (there's nothing on line in actual file, blank line) is there purpose blank line? it's common use newline indicate end of line, last line. many editors (like vi, use) add in newline silently. consensus text files (especially in unix world) should end in newline, , there have been problems historically if wasn't present. why should text files end newline? the tool used count lines in file "wc" counts newlines in file, without trailing newline show 3 instead of 4. it improves readability of templates used in generator. consider: https://github.com/rails/rails/blob/master/railties/lib/rails/generators/rails/controller/templates/controller.rb to remove trailing newline, template have last line of: end<% end -%> instead of: end <% end -%> that seems less readable me. the discussion below refers
Read more

keyboard - Smiles and long press feature in Android -

i've created android keyboard. how add features inserting smilies, , using long keypresses display symbols? to create long-press behavior allows select several options pop-up menu, follow guide (specifically pop-up menu section): http://developer.android.com/guide/topics/ui/menus.html smileys (also known emoticons) combination of keys, understood programs , parsed same way. have do, when clicks smiley face on keyboard, simulate pressing of key combination matching emoticon. example, when clicks smiley, should simulate key presses ':' , ')' :). here's list of emoticons: http://en.wikipedia.org/wiki/list_of_emoticons
Read more

node.js - Bad Request - node js ajax post -

i'm using express 3.0 , node v0.11.0. have button submits form , i'm using ajax post data json object node server. client code is: $('#contact').submit(function(e) { console.log('submit called'); var formdata = json.stringify($('form').serializeobject()); console.log(formdata); $.ajax({ url: "http://localhost:3000/savedata/", type: "post", datatype: 'json', data: {objectdata: formdata}, contenttype: "application/json", complete: function() { console.log('process complete'); }, success: function(data) { console.log('process sucess'); }, error: function() { console.log('process error'); }, }); return false; }); then on server: var express = require('express'); var app = express(); app.set('views', __dirname + '/views'); app.set('view engine', 'jade'); app.use(express.bodyparser());
Read more