Discard all changes made to a file in a branch

[JakeMalis]

This may be the wrong place to ask since this may be more of a Git related question, but the Github CLI may have a feature to help with this as well.

If I have a given file, lets say hello.txt, and I modify that file and many others in a branch I am working on. I commit my changes periodically and eventually decide I want to merge the branch. If I want to merge all the files from my branch to master, except hello.txt, how would I remove all changes that have been made to hello.txt?

[mislav]

Sorry, this is a general git question, and those should go elsewhere since we don't offer general git support in this project.

However: the easiest way to discard any changes made to a file when merging is to create a squash merge (note: all commits from the branch will be squashed into one):

git checkout master
git merge --squash my-branch
git reset hello.txt
git commit

[JakeMalis]

Thank you!