Python commands Archives

SOLVED: “Commit your changes or stash them before you can merge” – what to do ?

Sometimes you work with your changes through bitbucket online, after you open SourceTree on your local computer and after when you upload your changes, you can receive an error that some of the commits are not committed.

root@your-IP:/data/project-name # git pull
remote: Counting objects: 7, done.
remote: Compressing objects: 100% (5/5), done.
remote: Total 7 (delta 3), reused 0 (delta 0)
Unpacking objects: 100% (7/7), done.
From bitbucket.org:nickname/project-name
   269d0c6..ec9ffad  master     -> origin/master
Updating 36c9304..ec9ffad
error: Your local changes to the following files would be overwritten by merge:
	local

1

2

3

4

5

6

7

8

9

10

root@your-IP:/data/project-name # git pull

remote: Counting objects: 7, done.

remote: Compressing objects: 100% (5/5), done.

remote: Total 7 (delta 3), reused 0 (delta 0)

Unpacking objects: 100% (7/7), done.

From bitbucket.org:nickname/project-name

269d0c6..ec9ffad master -> origin/master

Updating 36c9304..ec9ffad

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

local

Steps to resolve: Discard the local changes…

How to connect to server via SSH

Open your terminal and put the following command

ssh root@your-domain
Pass: *****// Insert your password

//Find your folder with a project
cd /data/your-domain // your project folder

1

2

3

4

5

ssh root@your-domain

Pass: *****// Insert your password

//Find your folder with a project

cd /data/your-domain // your project folder

Python. Collecting information about git. Push updates to your website from bitbucket

If the project of your website is stored on bitbucket, after the updates, you will need to use the following command:

git pull

1

git pull

After your reposit can ask for a password, than you will have to give a path to your reposit and a password.

Password for 'Path to your reposit': Password

1	Password for 'Path to your reposit': Password

…