osx - git falsely marks entire file as merge conflict on same platform -


before downvote: i've read through autocrlf posts, nothing helped (we're not cross platform).

edit 2: looks file corrupt. creating new 1 solved problem, guess not git related.

edit: editing , using git diff | cat -t gives like:

diff —git a/css/style.css b/css/style.css index bd9b50a..8f8f7dc 100644 —- a/css/style.css +++ b/css/style.css @@ -1 +1 @@ -/* typo */^m^mbody {^m  font-size: 16px;^m  line-height: 1.5;^m}^m^ma {^m  color: #000;^m  color: #0770b2;^m}^m^m.main-carousel .item .carousel-caption .caption-content h1,^mh1 {^m

edit: not happen in other files of repo

we're 2 guys on os x working git. it's freaking css file being marked merge conflict no obvious reason.

basically, when both work on file , instance both change 2 existing, different lines each , commit, 1 pushes , other 1 pulls, person gets merge conflict entire file.

we've both tried autocrlf auto, input , false, no difference.

strangely, when pull , see conflict message , diff, being output:

diff --cc css/style.css index 10a8242,6b94ef0..0000000 --- a/css/style.css +++ b/css/style.css @@@ -1,1 -1,1 +1,5 @@@ } padding: 15px 0; {x;{b2;0b2;-caption .caption-content h2 {st-child {4d000000', endcolorstr='#00000000',gradienttype=1 ); /* ie6-9 */ } padding: 15px 0; {x;{b2;0b2;-caption .caption-content h2 {st-child {4d000000', endcolorstr='#00000000',gradienttype=1 ); ++<<<<<<< head } padding: 15px 0; {x;{b2;0b2;-caption .caption-content h2 {st-child {4d000000', endcolorstr='#00000000',gradienttype=1 ); /* ie6-9 */ ++======= } padding: 15px 0; {x;{b2;0b2;-caption .caption-content h2 {st-child {4d000000', endcolorstr='#00000000',gradienttype=1 ); ++>>>>>>> 7049454e778aa6c9c85d638f7b3898e55dac38d7

which absolutely makes no sense because these lines werent affected, dont appear in css file (what hell } padding: 15px 0; {x;{b2;0b2;-caption .caption-content h2 {st-child ? ).

this both our global git config (removed user , colors , stuff):

[apply]     whitespace = fix [core]     excludesfile = ~/.gitignore     whitespace = space-before-tab,-indent-with-non-tab,trailing-space   trustctime = false   precomposeunicode = false     filemode = false     autocrlf = false [diff]     renames = copies [diff "bin"]     textconv = hexdump -v -c [merge]     log = true

i'm desperate. looks major wrong. we're using 2.8.1.


Comments

Post a Comment

Popular posts from this blog

networking - Vagrant-provisioned VirtualBox VM is not reachable from Ubuntu host -

this question exact duplicate of: puphpet/vagrant: unable access lamp vm ip address 1 answer i following basic vagrant tutorial , vagrant provisions box on ubuntu without complaining. moreover, can vagrant ssh vm. however, vm not reachable host: it's not possible ping it's ip address. what have achieved: installed virtualbox (5.1.24 r117012 (qt5.5.1)) , vagrant (1.9.7) onto ubuntu (16.04.2 lts) machine. provisioned vm vagrant up , vagrant finishes job , not complain. vagrant ssh works. i have manually installed lighttpd on guest vm , can ping/curl address: localhost within guest vm. this when trying reach guest vm host: ~/tmp/myfirstvagrantproject$ ping 172.22.22.22 ping 172.22.22.22 (172.22.22.22) 56(84) bytes of data. ... icmp_seq=4 destination net unreachable ... 171 packets transmitted, 0 received, +21 errors, 100% packet loss, time 173
Read more

c# - ASP.NET Core - There is already an object named 'AspNetRoles' in the database -

i'm receiving error applicationdbcontext database when trying update entity framework. i've googled, tried fixes here on so, no avail. i'm deleting database each time make change, once deploy, not option. here's error: pm> update-database -context applicationdbcontext system.data.sqlclient.sqlexception: there object named 'aspnetroles' in database. @ system.data.sqlclient.sqlconnection.onerror(sqlexception exception, boolean breakconnection, action 1 wrapcloseinaction) @ system.data.sqlclient.tdsparser.throwexceptionandwarning(tdsparserstateobject stateobj, boolean callerhasconnectionlock, boolean asyncclose) @ system.data.sqlclient.tdsparser.tryrun(runbehavior runbehavior, sqlcommand cmdhandler, sqldatareader datastream, bulkcopysimpleresultset bulkcopyhandler, tdsparserstateobject stateobj, boolean& dataready) @ system.data.sqlclient.sqlcommand.runexecutenonquerytds(string methodname, boolean async, int32 timeout, boolean
Read more

ruby on rails - ArgumentError: Missing host to link to! Please provide the :host parameter, set default_url_options[:host], or set :only_path to true -

i have built module in solidus , ruby on rails , try create tests. i trying create integration tests , have error: e error: prescriptionphotostest#test_/prescription_photos_post_endpoint_throws_an_error_when_wrong_params: argumenterror: missing host link to! please provide :host parameter, set default_url_options[:host], or set :only_path true test/integration/prescription_photos_test.rb:6:in `block in ' i read this , this , doesn't make difference. my code returning error on line: @user = factorygirl.create(:user) here code files. prescription_photos_rest.rb require 'test_helper' class prescriptionphotostest < actiondispatch::integrationtest setup spree::auth::config[:confirmable] = false @user = factorygirl.create(:user) end def authenticated_header token = knock::authtoken.new(payload: { sub: @user.id }).token { 'authorization': "bearer #{token}" } end test '/prescription_p
Read more