Uploading into BitBucket error! Please provide simple steps for a novice being!

Aditya_a1dq8r

Hi, I am having  difficulties in uploading my project into a repository online because i wanted to upload three separate folders into one repository and for many hours i had these errors.  

Could some please provide simplest way possible to upload two separate project folders into one or a simplest method possible.

Thanks

Some errors were 

C:\Users\ADITYA\PycharmProjects\DBSCAN>git commit -m "First Commit"

On branch master

nothing to commit, working tree clean

 

C:\Users\ADITYA\PycharmProjects\DBSCAN>git push -u origin master

To https://bitbucket.org/aditya_d/masterproject827755.git

 ! [rejected]        master -> master (non-fast-forward)

error: failed to push some refs to 'https://aditya_d@bitbucket.org/aditya_d/masterproject827755.git'

hint: Updates were rejected because the tip of your current branch is behind

hint: its remote counterpart. Integrate the remote changes (e.g.

hint: 'git pull ...') before pushing again.

hint: See the 'Note about fast-forwards' in 'git push --help' for details.

Also, please provide a detailed solution and not have you read instructions.I read instructions and an hour was spent but a Youtube video helped me to upload one project in 10 mins. But i made a mistake again. Apologies

Jobin Kuruvilla [Adaptavist]

You just need to pull the changes from remote to your local first before pushing the changes.

1. git pull
2. git push origin master

If you get a merge conflict after #1, you will have to resolve them and commit the resolved files.