GIT - error: Your local changes to the following files would be overwritten by merge:

When you see :
error: Your local changes to the following files would be overwritten by merge:

Execute the following :
#1 -
git reset --hard HEAD^

#2 -
git pull .git/ yourbranch

Log SLOW Request mysql

#/etc/init.d/mysqld
get_mysql_option mysqld_safe log-slow-queries "/var/log/slow-query.log"
slowqueryfile="$result"

/usr/bin/mysqld_safe --datadir="$datadir" --socket="$socketfile" --log-slow-queries="$slowqueryfile" \
--log-error="$errlogfile" --pid-file="$mypidfile" --max_allowed_packet=36M \
--user=mysql >/dev/null 2>&1 &

MAYBE USEFUL
[root@ip~]# touch /var/log/slow-query.log
[root@ip ~]# chown mysql:mysql /var/log/slow-query.log
[root@ip~]# chmod -R 777 /var/log/slow-query.log

#ETC/MY.CNF

[mysqld]
datadir=/var/lib/mysql

Show hidden files with his MAC

Type the following into a Terminal :

defaults write com.apple.finder AppleShowAllFiles TRUE

Redirect non-www to www in the htaccess file

RewriteCond %{HTTP_HOST} !^www\.
RewriteRule ^(.*)$ http://www.%{HTTP_HOST}/$1 [R=301,L]

Easy !
David Raleche

Faster Apache - httpd.conf - Ralech Solution - Gzip-Etag - Make it Faster !

# ETAG

Header unset Pragma
Header unset ETag
FileETag None

#Header unset Last-Modified
Header set Last-Modified "Fri, 21 Dec 2013 00:00:00 GMT"
Header set Expires "Fri, 21 Dec 2013 00:00:00 GMT"
Header set Cache-Control "max-age=864000, public, must-revalidate"
ExpiresActive On
ExpiresDefault "access plus 19 days"
ExpiresByType text/css "access plus 7 days"
ExpiresByType text/javascript "access plus 7 days"
ExpiresByType application/javascript "access plus 7 days"
ExpiresByType image/gif "access plus 3 months"
ExpiresByType image/png "access plus 3 months"

GIT resolved a conflict on your Centos server

git checkout --ours filename.c
git commit -m "using theirs"

David Raleche

Pages

Latest Post

Popular Post

Our Skills

Author

Project Director Information Architect Database Administrator Unix Administrator Senior Developer Project Manager Product Manager Web Marketer Cloud Engineer

Contact Us

For any questions or project ideas please contact me at the following.

I'm here