Category: Git

Posted on

Circle Ci pipeline deployment Failed with error Execute “deploy:unlock” task to unlock.

While you are deploying your code with the Circle ci pipeline and if your deployment is stuck without deployment success and if the error will be thrown like this,

Deploy locked by ci.
Execute “deploy:unlock” task to unlock

You can fix this issue by manually deleting deploy.lock from your server.

In my case, It was a Sonassi server and You have to go SSH with your project root,

project_root_domain/___deploy/.dep/deploy.lock

Just Delete the deploy.lock file from here and start deployment again to fix the issue.

Whenever a deployment starts it creates a lock file to naturally stop against multiple deploys being done since a deployment can touch the database. You need to manually remove this file to run the deployment again.

When Deployment started, https://github.com/deployphp/deployer/blob/master/recipe/common.php#L137 It can already lock the current deployment before the release is completed.

Posted on

How to merge feature branch from master in Git?

Git merging the feature branch from the master branch will be helpful while you are working with the feature branch and your parent master/main branch is updated with new changes.

You can take the master branch changes to your feature branch by running a few commands to update your local feature with the same as the master. Continue reading “How to merge feature branch from master in Git?”

Posted on

How to fetch Remote Branch updates in local branch by Git?

The remote branch is the branch that resides in the remote repository.

If you want to match the code updates on the local branch same as the remote branch you can run the two git commands to match the local branch content identical to the remote branch. Continue reading “How to fetch Remote Branch updates in local branch by Git?”