Скачать или смотреть How to Sync Your Branch with Master While Keeping Specific Directories Intact

Learn how to synchronize your Git branch with the master while preserving specific directory changes using straightforward commands.
---
This video is based on the question https://stackoverflow.com/q/67816713/ asked by the user 'Vespene Gas' ( https://stackoverflow.com/u/3323526/ ) and on the answer https://stackoverflow.com/a/67817733/ provided by the user 'Romain Valeri' ( https://stackoverflow.com/u/1057485/ ) 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: How can I sync other branch with mine while keeping specific directories?

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.
---
Sync Your Branch with Master While Keeping Specific Directories Intact

In the world of version control systems, Git excels at streamlining the collaboration process among developers. However, there are scenarios that can cause developers to face challenges when trying to sync their branches, particularly when only certain directories should be preserved. If you've ever found yourself in a situation where you need to align your branch with the master but keep changes in specific directories, this post will guide you on how to do that effectively.

Understanding the Problem

Let's set the stage:

You have been actively working on your branch, referred to as my_branch, while simultaneously seeking to keep updated with the master branch.

Despite working exclusively in your directory (my_dir/), you grapple with the unexpected changes in other directories (somebody1/, somebody2/, etc.) that should remain untouched.

Your merges between my_branch and master might have unintentionally altered files in those directories.

This can create a difficult situation, especially if you want your non-my_dir/ files in my_branch to reflect the current state of master without losing your changes.

The Solution

Fortunately, Git provides commands that can help you achieve your goal. Here’s how you can resynchronize your branch with master while keeping your specific directory intact.

Step-by-Step Guide

Fetch Updates from Remote
Start by fetching the updates from the remote repository. This ensures you have the latest changes from master.

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

Restore Files from Master
Next, use the git restore command to reset your branch files to match those in master, excluding your specific directory (my_dir/). This is done using the following command:

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

This command will restore all files in your branch to mirror the current state of the remote master.

Reapply Your Directory Changes
Following that, you need to ensure your changes in my_dir/ remain intact. You can do so by restoring that specific directory from your branch:

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

Commit Your Changes
Finally, commit the changes to finalize the synchronization. This will effectively save the state of your branch with respect to master, excluding the changes in my_dir/.

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

Important Note

In case your Git version is prior to 2.20.1, the git restore command may not be available. As an alternative, you can use the following older git checkout command:

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

Make sure to also clean up any unwanted files after the operation if necessary by utilizing git clean.

Conclusion

By following the steps outlined in this guide, you can seamlessly sync your branch with master, maintaining the integrity of your specific directories. Git's powerful commands allow for precise control over version management, ensuring that your original work isn't lost amidst collaborative updates. With a little know-how and the right commands, you can keep your projects organized and efficient—empowering you to focus more on your code and less on potential merge conflicts.

Feel free to share your experiences or ask further questions in the comments below! Happy coding!