0

I have a git repository with two branch, dev and featureA

When I finished featureA so I merge it into dev, but featureA branch has some new files that dev does not have, like newFileA.cs and newFileB.cs, the problem is that the new files does not automatically added to the project in dev branch.

so, which steps I missed here?

I find the SO answer here may be useful, but I don't want manually add each files every time there is a new file from another branch.

Community
  • 1
  • 1
Liu Hao
  • 472
  • 4
  • 24
  • Did you add them in the feature branch? If you did, aren't you using some conflict resolution on .csproj files which could discard the additions? – max630 Sep 10 '16 at 23:39
  • @max630 I fingered it out. the file is added to feature branch, but the .csproj is not included in the feature branch, so merge doesn't have conflict – Liu Hao Sep 11 '16 at 07:35
  • so, That means the project information is stored in .csproj file. **But merge the .csproj file is another awful thing!** – Liu Hao Sep 11 '16 at 07:38

0 Answers0