Скачать или смотреть How to Recover Deleted Files with git reset --mixed in Git

Learn how to effectively recover your files after using the `git reset --mixed` command in Git. Discover useful steps and commands to retrieve accidentally deleted files from your C++ project.
---
This video is based on the question https://stackoverflow.com/q/70591327/ asked by the user 'Maxime Charrière' ( https://stackoverflow.com/u/15045363/ ) and on the answer https://stackoverflow.com/a/70593451/ provided by the user 'LeGEC' ( https://stackoverflow.com/u/86072/ ) at 'Stack Overflow' website. Thanks to these great users and Stackexchange community for their contributions.

Visit these links for original content and any more details, such as alternate solutions, latest updates/developments on topic, comments, revision history etc. For example, the original title of the Question was: git reset --mixed delete newly added file?

Also, Content (except music) licensed under CC BY-SA https://meta.stackexchange.com/help/l...
The original Question post is licensed under the 'CC BY-SA 4.0' ( https://creativecommons.org/licenses/... ) license, and the original Answer post is licensed under the 'CC BY-SA 4.0' ( https://creativecommons.org/licenses/... ) license.

If anything seems off to you, please feel free to write me at vlogize [AT] gmail [DOT] com.
---
Navigating the Dangers of git reset --mixed: How to Recover Lost Files

When working with Git, it's easy to stumble upon complications that can lead to unintended consequences, especially when it comes to managing your codebase. One common scenario arises when you use the git reset --mixed command and subsequently lose files you thought were untouched. In this guide, we will explore:

The implications of using git reset --mixed

How to recover lost files

Safeguarding your workflow in the future

Understanding the Problem

Imagine you are developing a C++ project and have just made significant updates to your codebase. While trying to push your changes to GitHub, you find that your commit contains a large file that exceeds GitHub's file size limit. To rectify the issue, you execute the git reset --mixed command, expecting to revert just the commit without affecting your working directory or files.

However, you find that the newly added files are gone after this command. This leads to the nagging question: Isn't git reset --mixed supposed to keep my files intact?

The Consequence of git reset --mixed

In a typical scenario, using git reset --mixed should remove the previous commit while leaving the changes in your files. However, there can be cases where internal actions taken by your code editor or Integrated Development Environment (IDE) interfere with that expectation. This can result in newly created files being misplaced or deleted, causing significant disruptions in your workflow.

Steps to Recover Your Deleted Files

Fortunately, there are methods to recover the files that were lost during this process. Here’s how you can retrieve them:

1. Check the Reflog

The reflog acts as an internal log that tracks your Git operations. Use it to find the SHA commit reference of the deleted files:

[[See Video to Reveal this Text or Code Snippet]]

This command will give you a list of all recent actions and their associated commit hashes.

2. Identify the Commit SHA

Look for the commit that contained your lost files (in this case, the commit labeled A). Note down the SHA (a long string of characters).

3. Restore Files from the Commit

You have multiple options to restore the files. Choose whichever fits your needs:

Reset to commit A:

[[See Video to Reveal this Text or Code Snippet]]

This command returns your state to commit A, recovering all files from that point.

Checkout Specific Files: If you only want to restore certain files:

[[See Video to Reveal this Text or Code Snippet]]

Replace file1 and file2 with the actual filenames you wish to retrieve.

Using the Restore Command:

[[See Video to Reveal this Text or Code Snippet]]

This command will restore all files from commit A. You can also target specific files, similar to the checkout method:

[[See Video to Reveal this Text or Code Snippet]]

Choose the Method That Works Best for You

The commands above will help you regain control of your files. Depending on your situation, you may choose to restore all files or just a few.

Preventing Future Issues

To avoid losing files in the future, consider the following practices:

Regular Commits: Make commits often, even for small changes. This creates more restore points.

Frequent Backups: Use alternate storage solutions to back up your complete projects.

Read Command Documentation: Familiarize yourself with Git commands, especially ‘reset’ commands, and their implications.

Test Commands in a Safe Environment: If you're trying new commands, experiment in a separate repository or branch to ensure no work is lost.

Conclusion

Dealing with Git can undoubtedly challenge even experienced developers. Understanding how commands like git reset -