Error while resolving conflicts after latest pull from master branch

I pulled latest remote master branch into my private branch but the automatic merge failed and there were conflicts I tried resolving them by accepting the changes from master branch with the command git checkout --theirs <filename> but it is throwing an error : pathspec 'filename' did not match any file(s) known to git. How do I resolve this?

Solution

You should issue the command git status to know the right relative path of each file to pass to the git checkout --theirs -- <FILE_NAMES_LIST>.

Should I merge master into a feature branch to bring it up to date? Would this be considered bad practice?
Switch node_modules folder when I change git branch
git p4 submit fails
Assign the latest release in GitHub (not using git)
How to sign out github account in vs code
Visual Studio Team Explorer - GIT: Automatically ignoring new files
Get modified files in Github actions
Command to open file with git
git - gpg onto mac osx: error: gpg failed to sign the data
Git credential helper - update password
How to remove cached credentials from Git?
If I fork someone else's private Github repo into my account, is it going to appear in my account as a public repo?
Using local git username and email on remote machine
How do I delete all Git branches which have been merged?
Switch to another Git tag
Merging changes from master into my branch
Refname 'master' is ambiguous
git fetch origin --prune doesn't delete local branches?
Git: warning: refname 'master' is ambiguous
git: don't sort 'for-each-ref' output
GitKraken won't open
git shows files changed with 0 insertions(+), 0 deletions(-)
How do I access my SSH public key?
Can't push to GitHub because of large file which I already deleted
Overwrite the master branch with a orphan branch in git
Why did Git throw "Failed to load library 'libcurl-4.dll'" while cloning?
In merge request gitlab ci shows error that previous job needs another job but is not in any previous stage but it is
Git get history of branches that i was in
How do you remove an invalid remote branch reference from Git?
Git archive including the actual repository?