Git Overwrite Error on push for certain file: Why won't git push --force or git stash work?How to remove local (untracked) files from the current Git working treeHow to selectively merge or pick changes from another branch in Git?Git workflow and rebase vs merge questionsHow do I force “git pull” to overwrite local files?How to get just one file from another branchUndo a Git merge that hasn't been pushed yetStash only one file out of multiple files that have changed before git 2.13How do I properly force a Git push?How can I reconcile detached HEAD with master/origin?Remove tracking branches no longer on remote

Printing a list as "a, b, c." using Python

How do you say "half the time …, the other half …" in German?

Why did the population of Bhutan drop by 70% between 2007 and 2008?

RAID0 instead of RAID1 or 5, is this crazy?

Why is "I let him to sleep" incorrect (or is it)?

Are there any to-scale diagrams of the TRAPPIST-1 system?

Can a network vulnerability be exploited locally?

Can I get a PhD for developing educational software?

In Endgame, wouldn't Stark have remembered Hulk busting out of the stairwell?

Why did Starhopper's exhaust plume become brighter just before landing?

Why does AM radio react to IR remote?

What ways are there to "PEEK" memory sections in (different) BASIC(s)

Why does glibc's strlen need to be so complicated to run quickly?

In how many ways we can distribute 7 distinct balls among 3 students such that everyone gets at least 2 balls?

Coupling two 15 Amp circuit breaker for 20 Amp

Is the Amazon rainforest the "world's lungs"?

Did the Apollo Guidance Computer really use 60% of the world's ICs in 1963?

How to prevent a hosting company from accessing a VM's encryption keys?

Get contents before a colon

Is the internet in Madagascar faster than in UK?

Is belaying with a hip belay unsafe?

Should I judge the efficacy of Samadhi based on the ethical qualities of the meditator?

Why might one *not* want to use a capo?

Pen test results for web application include a file from a forbidden directory that is not even used or referenced

Git Overwrite Error on push for certain file: Why won't git push --force or git stash work?

How to remove local (untracked) files from the current Git working treeHow to selectively merge or pick changes from another branch in Git?Git workflow and rebase vs merge questionsHow do I force “git pull” to overwrite local files?How to get just one file from another branchUndo a Git merge that hasn't been pushed yetStash only one file out of multiple files that have changed before git 2.13How do I properly force a Git push?How can I reconcile detached HEAD with master/origin?Remove tracking branches no longer on remote

.everyoneloves__top-leaderboard:empty,.everyoneloves__mid-leaderboard:empty,.everyoneloves__bot-mid-leaderboard:empty margin-bottom:0;

I'm trying to push a file change via git. I added and committed the file just as I would do for any other push. However, when I push I get this error:
remote: error: Your local changes to the following files would be overwritten by merge: remote: filename.html remote: Please, commit your changes or stash them before you can merge. remote: Aborting

The thing is, I did commit the changes. I tried to redo the edits and ran through the add/commit process a few times, and every time I push I get the same error. Any idea how to fix?

I've tried to force the push with git push --force origin branch and git push origin branch --force. Still the same error.

I tried to stash the changes its referencing in the error with git stash and it says No local changes to save.

I tried git reset --hard origin/master. Still the same error when trying to push that specific file. I have no problems push other files, just this one.

I'd like to be able to push changes to this file, I'm just not sure how to get past this error. Any help would be appreciated.

Here is the complete text I get when I try to push:

Enumerating objects: 9, done. Counting objects: 100% (9/9), done. Delta compression using up to 4 threads Compressing objects: 100% (5/5), done. Writing objects: 100% (5/5), 418 bytes | 418.00 KiB/s, done. Total 5 (delta 4), reused 0 (delta 0) remote: remote: **** Pulling changes into Live [Hub's post-update hook] remote: remote: From /var/git/html remote: * branch master -> FETCH_HEAD remote: error: Your local changes to the following files would be overwritten by merge: remote: filename.html remote: Please, commit your changes or stash them before you can merge. remote: Aborting remote: Updating fb7c657..b64906e To website.com:/var/git/html.git bf653d3..b64906e master -> master

edited Mar 27 at 21:14

asked Mar 27 at 16:32

Jacob Bryant

284 bronze badges

Many things makes no sense here. One doesn't push files in git. You only push commits. And no merge can occur on a push. Remote refs are updated along the rules of fast-forward merging, yes, in a sense, but in no circumstances the process would merge anything locally on a push. Really hard to figure out what happened from your description.

– RomainValeri
Mar 27 at 21:09

In this case, I mean that when I push commits that feature changes for that specific file. It specifically references merges in the error message. Thanks for taking the time to comment @RomainValeri I'll add the entire text I get on push to the post. Let me know what you think

– Jacob Bryant
Mar 27 at 21:13

That's what I thought : a pull. Look at GitHub's remote log : there is a hook launching a pull. It doesn't change much to your problem, I admit that. But it makes way more sense now. I don't get why you can't simply add/commit your file, though. Yet >:-)

– RomainValeri
Mar 27 at 21:17

I've noticed that before but I didn't think much of it. I'm not as experienced as I'd like to be with git. I guess I will look into what is causing that hook and maybe I'll get some insight as to what is going on. I've no idea why I can't at least force a push after its committed, it certainly has me stumped. Thanks again @RomainValeri if you have any more insight or maybe some resources you could suggest it would be much appreciated

– Jacob Bryant
Mar 27 at 21:26

--force doesn't change anything here, you're forcing an open door. The remote accepts your push, even without force, then it executes the ref update, and at this point its hook mechanism kicks in, "hey! has something just been pushed? Execute this." ... cue the pull. This "error" is, in a strange way, confirmation that your push worked. If you didn't intend to put that hook into place and can disable it, I'd do that.

– RomainValeri
Mar 27 at 21:29

|
show 1 more comment

The thing is, I did commit the changes. I tried to redo the edits and ran through the add/commit process a few times, and every time I push I get the same error. Any idea how to fix?

I've tried to force the push with git push --force origin branch and git push origin branch --force. Still the same error.

I tried to stash the changes its referencing in the error with git stash and it says No local changes to save.

I tried git reset --hard origin/master. Still the same error when trying to push that specific file. I have no problems push other files, just this one.

I'd like to be able to push changes to this file, I'm just not sure how to get past this error. Any help would be appreciated.

Here is the complete text I get when I try to push:

edited Mar 27 at 21:14

asked Mar 27 at 16:32

Jacob Bryant

284 bronze badges

Many things makes no sense here. One doesn't push files in git. You only push commits. And no merge can occur on a push. Remote refs are updated along the rules of fast-forward merging, yes, in a sense, but in no circumstances the process would merge anything locally on a push. Really hard to figure out what happened from your description.

– RomainValeri
Mar 27 at 21:09

In this case, I mean that when I push commits that feature changes for that specific file. It specifically references merges in the error message. Thanks for taking the time to comment @RomainValeri I'll add the entire text I get on push to the post. Let me know what you think

– Jacob Bryant
Mar 27 at 21:13

That's what I thought : a pull. Look at GitHub's remote log : there is a hook launching a pull. It doesn't change much to your problem, I admit that. But it makes way more sense now. I don't get why you can't simply add/commit your file, though. Yet >:-)

– RomainValeri
Mar 27 at 21:17

I've noticed that before but I didn't think much of it. I'm not as experienced as I'd like to be with git. I guess I will look into what is causing that hook and maybe I'll get some insight as to what is going on. I've no idea why I can't at least force a push after its committed, it certainly has me stumped. Thanks again @RomainValeri if you have any more insight or maybe some resources you could suggest it would be much appreciated

– Jacob Bryant
Mar 27 at 21:26

--force doesn't change anything here, you're forcing an open door. The remote accepts your push, even without force, then it executes the ref update, and at this point its hook mechanism kicks in, "hey! has something just been pushed? Execute this." ... cue the pull. This "error" is, in a strange way, confirmation that your push worked. If you didn't intend to put that hook into place and can disable it, I'd do that.

– RomainValeri
Mar 27 at 21:29

|
show 1 more comment

The thing is, I did commit the changes. I tried to redo the edits and ran through the add/commit process a few times, and every time I push I get the same error. Any idea how to fix?

I've tried to force the push with git push --force origin branch and git push origin branch --force. Still the same error.

I tried to stash the changes its referencing in the error with git stash and it says No local changes to save.

I tried git reset --hard origin/master. Still the same error when trying to push that specific file. I have no problems push other files, just this one.

I'd like to be able to push changes to this file, I'm just not sure how to get past this error. Any help would be appreciated.

Here is the complete text I get when I try to push:

edited Mar 27 at 21:14

asked Mar 27 at 16:32

Jacob Bryant

284 bronze badges

The thing is, I did commit the changes. I tried to redo the edits and ran through the add/commit process a few times, and every time I push I get the same error. Any idea how to fix?

I've tried to force the push with git push --force origin branch and git push origin branch --force. Still the same error.

I tried to stash the changes its referencing in the error with git stash and it says No local changes to save.

I tried git reset --hard origin/master. Still the same error when trying to push that specific file. I have no problems push other files, just this one.

I'd like to be able to push changes to this file, I'm just not sure how to get past this error. Any help would be appreciated.

Here is the complete text I get when I try to push:

git gitlab

edited Mar 27 at 21:14

asked Mar 27 at 16:32

Jacob Bryant

284 bronze badges

edited Mar 27 at 21:14

asked Mar 27 at 16:32

Jacob Bryant

284 bronze badges

edited Mar 27 at 21:14

asked Mar 27 at 16:32

Jacob Bryant

284 bronze badges

asked Mar 27 at 16:32

Jacob Bryant

284 bronze badges

asked Mar 27 at 16:32

Jacob Bryant

284 bronze badges

Many things makes no sense here. One doesn't push files in git. You only push commits. And no merge can occur on a push. Remote refs are updated along the rules of fast-forward merging, yes, in a sense, but in no circumstances the process would merge anything locally on a push. Really hard to figure out what happened from your description.

– RomainValeri
Mar 27 at 21:09

In this case, I mean that when I push commits that feature changes for that specific file. It specifically references merges in the error message. Thanks for taking the time to comment @RomainValeri I'll add the entire text I get on push to the post. Let me know what you think

– Jacob Bryant
Mar 27 at 21:13

That's what I thought : a pull. Look at GitHub's remote log : there is a hook launching a pull. It doesn't change much to your problem, I admit that. But it makes way more sense now. I don't get why you can't simply add/commit your file, though. Yet >:-)

– RomainValeri
Mar 27 at 21:17

I've noticed that before but I didn't think much of it. I'm not as experienced as I'd like to be with git. I guess I will look into what is causing that hook and maybe I'll get some insight as to what is going on. I've no idea why I can't at least force a push after its committed, it certainly has me stumped. Thanks again @RomainValeri if you have any more insight or maybe some resources you could suggest it would be much appreciated

– Jacob Bryant
Mar 27 at 21:26

--force doesn't change anything here, you're forcing an open door. The remote accepts your push, even without force, then it executes the ref update, and at this point its hook mechanism kicks in, "hey! has something just been pushed? Execute this." ... cue the pull. This "error" is, in a strange way, confirmation that your push worked. If you didn't intend to put that hook into place and can disable it, I'd do that.

– RomainValeri
Mar 27 at 21:29

|
show 1 more comment

Many things makes no sense here. One doesn't push files in git. You only push commits. And no merge can occur on a push. Remote refs are updated along the rules of fast-forward merging, yes, in a sense, but in no circumstances the process would merge anything locally on a push. Really hard to figure out what happened from your description.

– RomainValeri
Mar 27 at 21:09

In this case, I mean that when I push commits that feature changes for that specific file. It specifically references merges in the error message. Thanks for taking the time to comment @RomainValeri I'll add the entire text I get on push to the post. Let me know what you think

– Jacob Bryant
Mar 27 at 21:13

That's what I thought : a pull. Look at GitHub's remote log : there is a hook launching a pull. It doesn't change much to your problem, I admit that. But it makes way more sense now. I don't get why you can't simply add/commit your file, though. Yet >:-)

– RomainValeri
Mar 27 at 21:17

I've noticed that before but I didn't think much of it. I'm not as experienced as I'd like to be with git. I guess I will look into what is causing that hook and maybe I'll get some insight as to what is going on. I've no idea why I can't at least force a push after its committed, it certainly has me stumped. Thanks again @RomainValeri if you have any more insight or maybe some resources you could suggest it would be much appreciated

– Jacob Bryant
Mar 27 at 21:26

--force doesn't change anything here, you're forcing an open door. The remote accepts your push, even without force, then it executes the ref update, and at this point its hook mechanism kicks in, "hey! has something just been pushed? Execute this." ... cue the pull. This "error" is, in a strange way, confirmation that your push worked. If you didn't intend to put that hook into place and can disable it, I'd do that.

– RomainValeri
Mar 27 at 21:29

Many things makes no sense here. One doesn't push files in git. You only push commits. And no merge can occur on a push. Remote refs are updated along the rules of fast-forward merging, yes, in a sense, but in no circumstances the process would merge anything locally on a push. Really hard to figure out what happened from your description.

– RomainValeri
Mar 27 at 21:09

In this case, I mean that when I push commits that feature changes for that specific file. It specifically references merges in the error message. Thanks for taking the time to comment @RomainValeri I'll add the entire text I get on push to the post. Let me know what you think

– Jacob Bryant
Mar 27 at 21:13

That's what I thought : a pull. Look at GitHub's remote log : there is a hook launching a pull. It doesn't change much to your problem, I admit that. But it makes way more sense now. I don't get why you can't simply add/commit your file, though. Yet >:-)

– RomainValeri
Mar 27 at 21:17

I've noticed that before but I didn't think much of it. I'm not as experienced as I'd like to be with git. I guess I will look into what is causing that hook and maybe I'll get some insight as to what is going on. I've no idea why I can't at least force a push after its committed, it certainly has me stumped. Thanks again @RomainValeri if you have any more insight or maybe some resources you could suggest it would be much appreciated

– Jacob Bryant
Mar 27 at 21:26

--force doesn't change anything here, you're forcing an open door. The remote accepts your push, even without force, then it executes the ref update, and at this point its hook mechanism kicks in, "hey! has something just been pushed? Execute this." ... cue the pull. This "error" is, in a strange way, confirmation that your push worked. If you didn't intend to put that hook into place and can disable it, I'd do that.

– RomainValeri
Mar 27 at 21:29

|
show 1 more comment

1 Answer
1

active

oldest

votes

This is probably more appropriate as a comment but I lack the reputation to leave one.

What do you see when you run a git status ?

Are you certain you have the latest of your master branch?

answered Mar 27 at 21:01

Mike Faber

1153 silver badges11 bronze badges

Thanks for the response Mike. I encounter this error only if I make changes to that specific file. So if I run git status then it tells me On branch master Your branch is up to date with 'origin/master'. Then it tells me filename.html is not staged for commit like normal. So then I add and commit the file. Then I go to push and it gives the error I mentioned above.

– Jacob Bryant
Mar 27 at 21:08

And yea, I do a git pull before I start editing to be sure I have everything up to date. Appreciate you taking the time to help.

– Jacob Bryant
Mar 27 at 21:09

@Mike You sound like someone who deserves to comment more often.

– RomainValeri
Mar 27 at 21:32

add a comment |

Your Answer

StackExchange.ifUsing("editor", function ()
StackExchange.using("externalEditor", function ()
StackExchange.using("snippets", function ()
StackExchange.snippets.init();
);
);
, "code-snippets");

StackExchange.ready(function()
var channelOptions =
tags: "".split(" "),
id: "1"
;
initTagRenderer("".split(" "), "".split(" "), channelOptions);

StackExchange.using("externalEditor", function()
// Have to fire editor after snippets, if snippets enabled
if (StackExchange.settings.snippets.snippetsEnabled)
StackExchange.using("snippets", function()
createEditor();
);

else
createEditor();

);

function createEditor()
StackExchange.prepareEditor(
heartbeatType: 'answer',
autoActivateHeartbeat: false,
convertImagesToLinks: true,
noModals: true,
showLowRepImageUploadWarning: true,
reputationToPostImages: 10,
bindNavPrevention: true,
postfix: "",
imageUploader:
brandingHtml: "Powered by u003ca class="icon-imgur-white" href="https://imgur.com/"u003eu003c/au003e",
contentPolicyHtml: "User contributions licensed under u003ca href="https://creativecommons.org/licenses/by-sa/3.0/"u003ecc by-sa 3.0 with attribution requiredu003c/au003e u003ca href="https://stackoverflow.com/legal/content-policy"u003e(content policy)u003c/au003e",
allowUrls: true
,
onDemand: true,
discardSelector: ".discard-answer"
,immediatelyShowMarkdownHelp:true
);

);

draft saved

draft discarded

StackExchange.ready(
function ()
StackExchange.openid.initPostLogin('.new-post-login', 'https%3a%2f%2fstackoverflow.com%2fquestions%2f55382229%2fgit-overwrite-error-on-push-for-certain-file-why-wont-git-push-force-or-git%23new-answer', 'question_page');

);

Post as a guest

Name

Required, but never shown

1 Answer
1

active

oldest

votes

1 Answer
1

active

oldest

votes

This is probably more appropriate as a comment but I lack the reputation to leave one.

What do you see when you run a git status ?

Are you certain you have the latest of your master branch?

answered Mar 27 at 21:01

Mike Faber

1153 silver badges11 bronze badges

Thanks for the response Mike. I encounter this error only if I make changes to that specific file. So if I run git status then it tells me On branch master Your branch is up to date with 'origin/master'. Then it tells me filename.html is not staged for commit like normal. So then I add and commit the file. Then I go to push and it gives the error I mentioned above.

– Jacob Bryant
Mar 27 at 21:08

And yea, I do a git pull before I start editing to be sure I have everything up to date. Appreciate you taking the time to help.

– Jacob Bryant
Mar 27 at 21:09

@Mike You sound like someone who deserves to comment more often.

– RomainValeri
Mar 27 at 21:32

add a comment |

This is probably more appropriate as a comment but I lack the reputation to leave one.

What do you see when you run a git status ?

Are you certain you have the latest of your master branch?

answered Mar 27 at 21:01

Mike Faber

1153 silver badges11 bronze badges

Thanks for the response Mike. I encounter this error only if I make changes to that specific file. So if I run git status then it tells me On branch master Your branch is up to date with 'origin/master'. Then it tells me filename.html is not staged for commit like normal. So then I add and commit the file. Then I go to push and it gives the error I mentioned above.

– Jacob Bryant
Mar 27 at 21:08

And yea, I do a git pull before I start editing to be sure I have everything up to date. Appreciate you taking the time to help.

– Jacob Bryant
Mar 27 at 21:09

@Mike You sound like someone who deserves to comment more often.

– RomainValeri
Mar 27 at 21:32

add a comment |

This is probably more appropriate as a comment but I lack the reputation to leave one.

What do you see when you run a git status ?

Are you certain you have the latest of your master branch?

answered Mar 27 at 21:01

Mike Faber

1153 silver badges11 bronze badges

This is probably more appropriate as a comment but I lack the reputation to leave one.

What do you see when you run a git status ?

Are you certain you have the latest of your master branch?

answered Mar 27 at 21:01

Mike Faber

1153 silver badges11 bronze badges

answered Mar 27 at 21:01

Mike Faber

1153 silver badges11 bronze badges

answered Mar 27 at 21:01

Mike Faber

1153 silver badges11 bronze badges

answered Mar 27 at 21:01

Mike Faber

1153 silver badges11 bronze badges

Thanks for the response Mike. I encounter this error only if I make changes to that specific file. So if I run git status then it tells me On branch master Your branch is up to date with 'origin/master'. Then it tells me filename.html is not staged for commit like normal. So then I add and commit the file. Then I go to push and it gives the error I mentioned above.

– Jacob Bryant
Mar 27 at 21:08

And yea, I do a git pull before I start editing to be sure I have everything up to date. Appreciate you taking the time to help.

– Jacob Bryant
Mar 27 at 21:09

@Mike You sound like someone who deserves to comment more often.

– RomainValeri
Mar 27 at 21:32

add a comment |

Thanks for the response Mike. I encounter this error only if I make changes to that specific file. So if I run git status then it tells me On branch master Your branch is up to date with 'origin/master'. Then it tells me filename.html is not staged for commit like normal. So then I add and commit the file. Then I go to push and it gives the error I mentioned above.

– Jacob Bryant
Mar 27 at 21:08

And yea, I do a git pull before I start editing to be sure I have everything up to date. Appreciate you taking the time to help.

– Jacob Bryant
Mar 27 at 21:09

@Mike You sound like someone who deserves to comment more often.

– RomainValeri
Mar 27 at 21:32

Thanks for the response Mike. I encounter this error only if I make changes to that specific file. So if I run git status then it tells me On branch master Your branch is up to date with 'origin/master'. Then it tells me filename.html is not staged for commit like normal. So then I add and commit the file. Then I go to push and it gives the error I mentioned above.

– Jacob Bryant
Mar 27 at 21:08

And yea, I do a git pull before I start editing to be sure I have everything up to date. Appreciate you taking the time to help.

– Jacob Bryant
Mar 27 at 21:09

@Mike You sound like someone who deserves to comment more often.

– RomainValeri
Mar 27 at 21:32

add a comment |

Got a question that you can’t ask on public Stack Overflow? Learn more about sharing private information with Stack Overflow for Teams.

draft saved

draft discarded

Thanks for contributing an answer to Stack Overflow!

Please be sure to answer the question. Provide details and share your research!

But avoid …

Asking for help, clarification, or responding to other answers.

Making statements based on opinion; back them up with references or personal experience.

To learn more, see our tips on writing great answers.

draft saved

draft discarded

Post as a guest

Name

Required, but never shown

Name

Required, but never shown

Name

Required, but never shown

This page is only for reference, If you need detailed information, please check here

搜尋此網誌

Styjun

1 Answer
1

Your Answer

Post as a guest

1 Answer
1

1 Answer
1

Post as a guest

Popular posts from this blog

Kamusi Yaliyomo Aina za kamusi | Muundo wa kamusi | Faida za kamusi | Dhima ya picha katika kamusi | Marejeo | Tazama pia | Viungo vya nje | UrambazajiKuhusu kamusiGo-SwahiliWiki-KamusiKamusi ya Kiswahili na Kiingerezakuihariri na kuongeza habari

1 Answer 1

Your Answer

Sign up or log in

Post as a guest

Post as a guest

1 Answer 1

1 Answer 1

Sign up or log in

Post as a guest

Post as a guest

Sign up or log in

Post as a guest

Sign up or log in

Post as a guest

Sign up or log in

Post as a guest

Popular posts from this blog

Kamusi Yaliyomo Aina za kamusi | Muundo wa kamusi | Faida za kamusi | Dhima ya picha katika kamusi | Marejeo | Tazama pia | Viungo vya nje | UrambazajiKuhusu kamusiGo-SwahiliWiki-KamusiKamusi ya Kiswahili na Kiingerezakuihariri na kuongeza habari

1 Answer
1

1 Answer
1

1 Answer
1