{"thread":{"id":"33183","subject":"git merge problem","startedAt":"2013-03-14T19:27:17Z","lastAt":"2013-03-14T19:27:17Z","messageCount":1,"participants":["Коньков Евгений"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"211317","messageId":"15610448431.20130314232717@reg.ru","threadId":"33183","inReplyTo":null,"subject":"git merge problem","fromName":"Коньков Евгений","fromEmail":"kes@reg.ru","sentAt":"2013-03-14T19:27:17Z","receivedAt":"2013-03-14T19:27:17Z","isPatch":false,"sender":{"key":"kes@reg.ru","avatar":null},"body":"Hi\n\nI have started branch from master\nthen on master were changes in whitespace (code formatting)\nin branch on that lines changes were not.\n\nNow when I try to merge branch to master I get lost changes at space on master\nSo I try to ignore space change\n\ngit merge -Xignore-space-change my_branch\n I have lost formatting in master.\n\nI wanna to give priority to changes on branch master:\ngit merge -Xours my_branch\n\nand now also no results: I get old space formatting which were on\nbranch master before starting my_branch\n\nPlease tell me, how can I fix that problem?\n# git --version\ngit version 1.8.1.5\n\n\ngit diff master...new_function_find Domain.pm\nindex 7eb8191..5abba1c 100644\n--- a/lib/FrontOffice/Controller/API/RegRu2/Domain.pm\n+++ b/lib/FrontOffice/Controller/API/RegRu2/Domain.pm\n@@ -124,7 +124,7 @@ sub get_prices : Local {\n         return;\n     }\n\n-    my $show_renew_data  = $p->{show_renew_data}  || 0;\n+    my $show_renew_data        = $p->{show_renew_data} || 0;\n     my $show_update_data = $p->{show_update_data} || 0;\n     my $lang             = $r->{lang};\n\nas you see on branch master right formatting will be replaced by wrong\nformatting on branch new_function_find\n\nas I have said: doing #git merge -Xignore-space-change new_finction_find\nno result :_-((\n\nthe wrong formatting on branch new_function_find are old formatting\nthat were in branch master, before branch new_function_find were started\nno changes were made to that line on branch new_function_find\n\nwhile on branch new_function_find all new changes from master\nwere merged as:\n#git merge -s recursive -Xignore-space-change master\n\nplease help\n"}]}