unable to push changes to github using git

Question

I'm new to git and I have a github repository where I want to commit changes to a python file and push . However after accesing my repository from an ubuntu vm now that I am back to windows 10 when I want to push I get

error: failed to push some refs to 'https://github.com/BillSkentos/MovieFlix2020_E17136_SKENTOS_VASILIS.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.

I'm completely new to git and tried git checkout master and tried pushing but to same result . I would appreciate your help with this . Thank you in advance

You need to perform git pull as there are changes in the remote that you do not have. It states so in the message : hint: 'git pull ...') before pushing again. — tomerpacific
– tomerpacific, Commented Jun 28, 2020 at 9:32
@tomerpacific I just typed git pull and got Auto-merging webservice.py CONFLICT (content): Merge conflict in webservice.py Automatic merge failed; fix conflicts and then commit the result. — Vasilis Skentos
– Vasilis Skentos, Commented Jun 28, 2020 at 9:33
That means that the local changes you have made are causing a code conflict with the changes in the remote repository. Either fix them locally or stash them locally and apply them after pulling. — tomerpacific
– tomerpacific, Commented Jun 28, 2020 at 9:36
@tomerpacific Could you provide an example ? I'm new to git and find it hard to create the command you say — Vasilis Skentos
– Vasilis Skentos, Commented Jun 28, 2020 at 9:39

Tushar Jain · Accepted Answer · 2020-06-28 12:31:09Z

2

In Git 1.7.0 and later, you can checkout a new branch

git checkout -b <branch>

Edit files, add and commit. Then push with the -u (short for --set-upstream) option:

git push -u origin <branch>

Git will set up the tracking information during the push. Now by using these commands , you will not get any error.

answered Jun 28, 2020 at 12:31

Tushar Jain

1542 silver badges12 bronze badges

Sign up to request clarification or add additional context in comments.

Collectives™ on Stack Overflow

unable to push changes to github using git

1 Answer 1

Comments

Linked

Hot Network Questions

Collectives™ on Stack Overflow

1 Answer 1

Comments

Linked

Related