git - Different Commits - Error: The following untracked working tree files would be overwritten by merge -


i trying set production, testing , development environments site. came time of pushing first minor change production. however, when try it, gives following error:

error: following untracked working tree files overwritten merge:

changelog.txt copyright.txt blockquote install.mysql.txt install.pgsql.txt install.sqlite.txt install.txt license.txt maintainers.txt readme.txt upgrade.txt misc/arrow-asc.png misc/arrow-desc.png misc/configure.png misc/draggable.png

the list of files goes on , omitted them brevity.

my production , development .gitignore identical. namely, follows: 

# ignore configuration files may contain sensitive information. sites/*/settings*.php .htaccess  # ignore paths contain user-generated content. sites/*/files sites/*/private <<<<<<< head =======  # compiled source # ################### *.com *.class *.dll *.exe *.o *.so  # packages # ############ # it's better unpack these files , commit raw source # git has own built in compression methods *.7z *.dmg *.gz *.iso *.jar *.rar *.tar *.zip  # images # ############ *.jpg *.gif *.png *.pdf *.tiff  # logs , databases # ###################### *.log *.sql *.sqlite  # os generated files # ###################### .ds_store .ds_store? ._* .spotlight-v100 .trashes ehthumbs.db thumbs.db   # ignore default text files robots.txt /changelog.txt /copyright.txt /install*.txt /license.txt /maintainers.txt /upgrade.txt /readme.txt sites/readme.txt sites/all/modules/readme.txt sites/all/themes/readme.txt >>>>>>> 07326d6660b93c61b407c37a1582a37d5c374905

what can fix this? assume issue has how git ignores files.


-

Popular posts from this blog

php - How should I create my API for mobile applications (Needs Authentication) -

background so i've been researching quite bit past week api's , have been reading concepts , programming one. currently have website programmed in php using popular framework called laravel. website has user database , users able log dashboard on website, works want website side. now next project of business i'm focusing on creating mobile applications (ios & andriod).what need these mobile applications being able login through application ui (not being redirected site callback url) able view , manage dashboard. the method of authentication , authorization want use application go like client asks user login through ui user enters credentials client sends request login api the api checks if credentials correct api creates token stored in token database linked user id api returns 200 ok json response or this { "token" : "ols25usjiay81hdy81", "expiry" : 3/06/2016 14:00} client remembers token , expiry whenever user/c
Read more

5 Reasons to Blog Anonymously (and 5 Reasons Not To)

Image
This guest post is by Phil (not his real name) of somehighschoolblog . It used to be impossible to run a business anonymously. Sure, some authors could pull it off, but if you worked at an office, what were you supposed to do? Go to work with a bag over your head? But today anyone can accomplish this, because anyone can author a blog (and you thought I was going to tell you to work with a mask on, or something). Copyright Ovidiu Iordachi - Fotolia.com Depending on your motives, you may or may not have considered blogging anonymously. You probably didn’t contemplate blogging anonymously if: • your only motivation is to become “famous” • your blog connects to another part of your life • you are blogging to build more connections with your friends or boss. You should consider blogging anonymously if: • you’re planning on touching on a sensitive or taboo subject • you don’t want to be identified with your blog • you are worried about negative real-world consequences that could arise from y
Read more

Google AdWords and AdSense - A Dynamic Small Business Marketing Duo

Unless you have been living under a rock for the last year or so, you probably know that Google has become the king of the search engine hill. There are many reasons for this but number one in my opinion is that above all else they put value on content. Today I want to introduce you to two very powerful small business advertising options created by Google. These two ingenious programs have all but revolutionized the way advertising is done on the web. Warning: If you are thinking..."web advertising isn't for me, I just need a few more clients around the block"...you better read this or be prepared to have your competitors eat your lunch. Goolge AdSense - Again content is king at Google. This program allows web site "publishers" to add some code from Google and receive "content relevant" ads on their site from other site owners. Here is an example - those ads in the box on the right of the page are delivered by Google and are matched to the content
Read more