---
title: "Discussion on \"Resolve Git local changes to the following files would be overwritten\" | Hashnode"
description: "Discussion on \"Resolve Git local changes to the following files would be overwritten\". I ran into a new conflict using git today that took a bit of wrangling 🤠\n\"𝗬𝗼𝘂𝗿 𝗹𝗼𝗰𝗮𝗹 𝗰𝗵𝗮𝗻𝗴𝗲𝘀 𝘁𝗼 𝘁𝗵𝗲 𝗳𝗼𝗹𝗹𝗼𝘄𝗶𝗻𝗴 𝗳𝗶𝗹𝗲𝘀 𝘄𝗼𝘂𝗹𝗱 𝗯𝗲 𝗼𝘃𝗲𝗿𝘄𝗿𝗶𝘁𝘁𝗲𝗻 𝗯𝘆 𝗺𝗲"
url: "https://hashnode.com/posts/resolve-git-local-changes-to-the-following-files-would-be-overwritten/63e68af944454756784a423e"
---

[Feed](https://hashnode.com/feed) /

Discussion

# [Resolve Git local changes to the following files would be overwritten](https://blog.jennasrunbooks.com/resolve-git-local-changes-to-the-following-files-would-be-overwritten?utm_source=hashnode&utm_medium=feed)

I ran into a new conflict using git today that took a bit of wrangling 🤠 "𝗬𝗼𝘂𝗿 𝗹𝗼𝗰𝗮𝗹 𝗰𝗵𝗮𝗻𝗴𝗲𝘀 𝘁𝗼 𝘁𝗵𝗲 𝗳𝗼𝗹𝗹𝗼𝘄𝗶𝗻𝗴 𝗳𝗶𝗹𝗲𝘀 𝘄𝗼𝘂𝗹𝗱 𝗯𝗲 𝗼𝘃𝗲𝗿𝘄𝗿𝗶𝘁𝘁𝗲𝗻 𝗯𝘆 𝗺𝗲

Feb 10, 2023 · 1 min read · blog.jennasrunbooks.com  
Updated Sep 4  
Read the article

-   [#git](https://hashnode.com/tag/git)
-   [#devops](https://hashnode.com/tag/devops)
-   [#coding](https://hashnode.com/tag/coding)

## Written by

[Jenna's Runbooks](https://hashnode.com/@jennasrunbooks)

@jennasrunbooks

  
[View profile](https://hashnode.com/@jennasrunbooks)

Cloud Engineer & SRE transitioning to AI/ML Platform Engineering | Writing on AI Infra, MLOps & DevEx

Hi there! I'm a Cloud Engineer & SRE, documenting my transition into AI/ML Platform Engineering. I write technical deep-dives, hands-on implementation guides, CLI helper scripts, and visual architectures covering cloud, infrastructure, orchestration, governance, and modern AI runtimes.

## Responses

Markdown supported · ⌘↵ to post

No responses yet.