Saturday, 15 August 2015

github - Why do I get non-fast-forward error in git? -



github - Why do I get non-fast-forward error in git? -

i on no branch , person force stream, why when do

git force

i get:

! [rejected] master -> master (non-fast-forward) error: failed force refs 'https://github.com/dsak.git' prevent losing history, non-fast-forward updates rejected merge remote changes (e.g. 'git pull') before pushing again. see 'note fast-forwards' section of 'git force --help' details.

after perform git pull git push works fine.

no there wasn't commit on remote doesn't exist locally, vice versa right added files aren't in remote local

you might have same commits, sha1 must have differed somehow. can happen if did rebase of master @ point (including rebase --interactive, reorder or drop commits within master itself).

the other case when error message can pop while having same commits (and same sha1) when have conflicting tag (but don't think applies here).

git github

No comments:

Post a Comment