|
|
|
|
|
|
by CuriousCosmic
848 days ago
|
|
|
git wouldn't accept a push with conflicting changes on the remote but that's just because pushes are dumb (not bad, they just don't do anything fancy). The solution would be to pull upstream changes (so you know what you are potentially pushing your changes into) and then push. |
|
|