'origin/master' have diverged , not able to commit the code . Don't want to retrieve the last commit file

Asked Jan 08 '15 at 10:31

Active Jan 08 '15 at 11:07

Viewed 53 times

I am getting the Message when trying to commit the code :

error: failed to push some refs to 'https://xyz@bitbucket.org/xyz-iphone.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.

I don't want to go back the the last commit . The file which i am using is taken from previous commit .

How can i commit in same repository with / without changing the branch ?

edited Jan 08 '15 at 11:07

asked Jan 08 '15 at 10:31

coreDeviOS

1,468
2
14
27

git pull origin master – Vishwanath Jan 08 '15 at 10:34
I'm not sure I understand what you are trying to achieve. – Sascha Wolf Jan 08 '15 at 10:38
I had some trouble in source file in last commit . so i downloaded my source file from few previous commits. Now i am not able to commit in same repository. – coreDeviOS Jan 08 '15 at 10:43
Are you trying to `push`? Do you want to get the changes of the remote in your current branch? As it stands it's not clear what exactly you are trying to achieve. – Sascha Wolf Jan 08 '15 at 10:45
I don't want to get back the current branch git-hub changes . Just want to save my work on same repository . – coreDeviOS Jan 08 '15 at 10:52
You want to override the changes on the server? – Sascha Wolf Jan 08 '15 at 10:54
Exactly Yeah.. Thats what i a trying to do . – coreDeviOS Jan 08 '15 at 10:56
This should be able to help you: [Rolling back local and remote git repository by 1 commit](http://stackoverflow.com/questions/4647301/rolling-back-local-and-remote-git-repository-by-1-commit). It is only considering a **SINGLE** commit but can be easily applied to multiple. – Sascha Wolf Jan 08 '15 at 11:11

'origin/master' have diverged , not able to commit the code . Don't want to retrieve the last commit file

0 Answers0