Assume there are master branch and dev branch,
The file structure is as follows:
master
|--fileA
|--fileB
dev
|--fileA
|--fileB
Now I just want to merge the fileA file under dev into the fileA file under master,
However, I don’t want to merge the fileB file under dev into the fileB file under master,
That is, when merging, ignore the fileB files under the two branches;
What should I do?
Thank you.
![[Web front-end] Node.js quick start](https://img.php.cn/upload/course/000/000/067/662b5d34ba7c0227.png)
Use .gitignore
First switch to the master branch:
git checkout master然后把dev分支下的fileA“移”到本地：
git checkout dev -- fileA然后add，commit，push：
git add fileA,git commit -m "xxx",git push [repo] master