Home/ Questions/Q 8158813
In Process

The Archive Base Latest Questions

Editorial Team
  • 0
Asked: 2026-06-06T17:44:12+00:00

I pulled from origin to update my local, and one file had conflicting changes.

  • 0

I pulled from origin to update my local, and one file had conflicting changes. I resolved the conflict, but I can’t commit (locally) because git still thinks the file is conflicting:

$ git add style.css

This works – no errors or anything. Then:

$ git commit

Merge branch 'dev' of [origin] into dev

Conflicts:
        [path]/style.css
#
# It looks like you may be committing a MERGE.
# If this is not correct, please remove the file
#       .git/MERGE_HEAD
# and try again.
#

Why doesn’t this work?

Share

Leave an answer

You must login to add an answer.

Need An Account,

1 Answer

  1. Editorial Team

    Okay, so this doesn’t technically solve the original problem, but it does get around it. What I did was I backed up my changes to style.css and then reset my local dev branch to origin/dev. This resolved whatever it thought the conflict was, since local and origin were now identical, but also put my local dev branch one commit behind in the process.

    So then I just diffed my backup style.css (which had my most recent changes) against my now-current local version, merged my changes in, and committed.

    • 0