{"id":23040,"date":"2020-09-21T11:54:30","date_gmt":"2020-09-21T18:54:30","guid":{"rendered":"https:\/\/careerkarma.com\/blog\/?p=23040"},"modified":"2023-12-01T04:00:19","modified_gmt":"2023-12-01T12:00:19","slug":"git-your-local-changes-would-be-overwritten-by-checkout","status":"publish","type":"post","link":"https:\/\/careerkarma.com\/blog\/git-your-local-changes-would-be-overwritten-by-checkout\/","title":{"rendered":"Git Your local changes to the following files would be overwritten by checkout Solution"},"content":{"rendered":"\n

You cannot modify a file on two branches and switch between those branches without committing or stashing the file. This is because Git is unsure what changes should be saved and what changes should be overwritten.
<\/p>\n\n\n\n

This guide discusses the \u201cYour local changes to the following files would be overwritten by checkout\u201d error and what it means. We\u2019ll walk through an example so you can figure out how to fix this error.<\/p>\n\n\n\n

Your local changes to the following files would be overwritten by checkout<\/h2>\n\n\n\n

The Git version control<\/a> lets you maintain separate lines of development, called branches<\/a>. The changes on one branch are not reflected on another branch unless you merge the two branches.
<\/p>\n\n\n\n

When you navigate to a branch, you can view the repository at a particular time in its history and make the changes you need. You should commit the changes made when you are ready so Git keeps track of the evolution of your project.
<\/p>\n\n\n\n

You cannot switch between two branches if both branches contain an uncommitted file change. Git needs to know whether a file should be saved or part of a commit. This protects you from accidentally overwriting code you may want to refer back to later.<\/p>\n\n\n\n

An Example Scenario<\/h2>\n\n\n\n

We\u2019re going to clone a repository<\/a> that contains one file called README.md:<\/p>\n\n\n\n

git clone https:\/\/github.com\/career-karma-tutorials\/ck-git<\/pre><\/div>\n\n\n\n
The contents of the README.md file are as follows:<\/p>\n\n\n\n
# ck-git<\/pre><\/div>\n\n\n\n
Our repository has two branches: development and master. In our local working directory, we are going to change the README.md file on the origin master branch:
<\/p>\n\n\n\n
# Career Karma Git<\/pre><\/div>\n\n\n\n
Our master branch is now different from our remote repository. We\u2019re going to switch to our development branch and change the contents of its README to say:
<\/p>\n\n\n\n
# Career Karma [Development]<\/pre><\/div>\n\n\n\n
We can change this file on the development branch by executing these commands:<\/p>\n\n\n\n
git checkout development\nnano README.md<\/pre><\/div>\n\n\n\n
Next, switch back to the master branch, commit the changes made to the branch, and push them to our remote repository:
<\/p>\n\n\n\n
git checkout master\ngit add README.md\ngit commit -m "docs: Update README"\ngit push<\/pre><\/div>\n\n\n\n
The git checkout command<\/a> lets us switch to the master branch. In review, our remote repository now contains:
<\/p>\n\n\n\n