Delete a git file from branch after commiting

Question

I used git pull origin master to solve a conflict, now my files have been pulled from my master to my source branch, which is not what I wanted, I tried to delete them directly from Intelij, but my PR looks like this:

enter image description here

How can I delete the files that I do not want to my PR? Thanks

Answer 1

git rm should remove the file, but you need to commit the changes

Answer 2

Are the files you don't want from the master source? Then you can use

git reset --hard

you can only use

git merge --no-ff origin/<branch-name> 

to get the changes