I have 2 branches in SFDX enabled project. mybranch and develop. I want to merge selected changes from develop and then merge those in mybranch. As a starting point I am trying to use git diff to see what all is extra in develop, however, it is mentioning files like .forceignore, .gitignore and all. And I want to compare only force-app folder. Is there any way I could make git diff & git merge to ignore a set of files & folder as .gitignore is not working. FYI, I have already gone through following and it doesn't help me - https://stackoverflow.com/questions/17820056/git-diff-doesnt-ignore-specified-files-in-gitignore
Appreciate help with this.