Sometimes when you merge two git branches, it might give you conflict. Conflict occurs because the same line in the same file has been edited differently in the two branches. This confuses git as to which change to accept and merge. Git conflicts are to be always resolved manually before git can proceed with the merge.

For example, I have two different branches here named current-branch and dev-branch. I want to merge the changes in dev-branch to current-branch now but I am getting a conflict.

Now, to resolve the conflict, you the git mergetool

If you have not already conf...

After a long break of nearly 2 years, I tried to brush up my knowledge and wanted to started with Git. I created a bitbucket repo under my personal account, and setup the identities but no matter what, I was unable to clone the repo via ssh. I was getting the following error while trying to do it.

The error clearly stated it was a problem with my ssh key. I already checked and confirmed the following

1. I have added the SSH public key to the repo’s Access keys option.
2. I also tried to add it under Personal Settings -> Security -> SSH keys but both ...

Sometimes you might come across some errors as follows, when you start services in servers.

Nothing to worry, it could just be because you don’t have the proper permission to do so, or you failed to add a ‘sudo’ infront of the command. Juts try with sudo and it will work.

I was getting this error when I was trying to run a docker container using jenkins declarative pipeline script. This was being run on my localhost and below is what I needed to correct it.

Added jenkins user to docker group

The solution that actually worked was to change the permission of the sock file to 666

Once this was done my pipeline script started working!

One of my clients wanted to secure their slave nodes with a firewall, and asked to install CSF on the servers. We setup a new slave node and installed CSF and everything was working fine. Created a new VPS, and noticed that the VPS IP Address is not responding. There was no ping to the VPS IP Address from outside. Logged into the server via console and the IP Address was up in the server. However there was no inbound and outbound network connections.

Thinking it could be a resolver problem, I switched the resolver entries to use google DNS as follows.

Save and quit the file. Tried to ping google.com again from the server and it timed out again...

I was working on my client’s solusvm admin panel that I got kicked out suddenly. I started getting the following message, whatever way I tried to access the admin control panel.

I tried various ways to gain access, but nothing worked. The following trick helped me.

I logged in to the server as root via ssh and whitelisted my IP Address.

I was trying to setup a php script to send mail with SMTP Authentication. The script was ready, but when executed in a browser, it displayed the following error.

The problem appears because the php pear package Net_SMTP is not present in the server. You can install it in two way.

After that, execute the script again and...

My mysql server suddenly started showing my disk space usage as almost full.

But when I issued a disk usage check on / , it returned the usage to be very little.

I was sure there is something wrong. Hence, I checked for deleted files. You can use either of the following commands.

Noticed this error in a cpanel server while starting apache. Apache refused to start with the following error.

(28)No space left on device: mod_rewrite: Parent could not create RewriteLock file

Seeing the error, the first thing that I checked was the disk space in the server but it looked fine.

I was trying to install s3cmd in my centos6 server when i got the following error.

If you are getting python dependency issues with s3cmd tools in centos6, please instal EPEL repo and it will solve it.

wget http://dl...