Timeline for Cannot push to GitHub - keeps saying need merge
Current License: CC BY-SA 3.0
8 events
| when toggle format | what | by | license | comment | |
|---|---|---|---|---|---|
| Dec 4, 2017 at 16:39 | comment | added | Warren P | Either don't use it, or learn to use it right. If you force push to an important central repository shared by a team, you should lose all push access to all important repos. What you do on your own personal repo, to avoid learning the alternative ways out, will eventually affect your ability to work on shared repos. If you know what's happened before the force push, sometimes a force push is ok. If you don't, it's never ok. | |
| Nov 19, 2017 at 15:28 | comment | added | mike rodent |
This worked for me: personal project with 0 other collaborators. I had tried several other suggested "solutions" here on SO, none of which fixed what was a very simple problem: I had done a local reset --hard to a older commit and then done a couple more. Then I just wanted to push but the remote repo was not prepared to let me. WarrenP could actually help git learners by being less runic. Maybe he doesn't want to.
|
|
| Oct 3, 2017 at 17:21 | comment | added | Shaurya Uppal | $git push --force origin master | |
| Feb 9, 2016 at 20:49 | history | edited | Peter Mortensen | CC BY-SA 3.0 |
Copy edited.
|
| Jul 1, 2015 at 15:44 | history | edited | abatishchev | CC BY-SA 3.0 |
deleted 1 character in body
|
| Jul 29, 2014 at 16:32 | review | Late answers | |||
| Jul 29, 2014 at 16:34 | |||||
| Jul 29, 2014 at 16:21 | review | First posts | |||
| Jul 29, 2014 at 16:23 | |||||
| Jul 29, 2014 at 16:17 | history | answered | Teo | CC BY-SA 3.0 |