Can we merge two branches using git in cocos2d and do we have to add any specific files in gitignore

Cocos Creator
#1

Hello Everyone,
I have a project and I want to use git but I am confused what if i want to merge two branches and does it make any effect on my creator file, what types of files do i have to add on gitignore.

#2

Hi, if you want to merge two branches, you can ignore the .meta, which tends to cause uuid conflicts.
(Note: If there are some settings for resources, there may be problems, for example, for images set up a nine-box grid, will fail)