Ignore folders when merging branches

Unity Services
,
1

Is there a way to ignore specific folders and it’s content when merging branches?
(I’m using the Windows standalone app of Unity Version Control, ver 11.0.16.7935)

Example:
Branch A:
Folder: CommonStuffBetweenProjects * I want this to be merged
Folder: IndividualProjectStuff ** I want this to be ignored when merging, but retained in source control, so adding to ignore.conf would not work.

Branch B:
Folder: CommonStuffBetweenProjects * I want this to be merged
Folder: IndividualProjectStuff ** I want this to be ignored when merging, but retained in source control, so adding to ignore.conf would not work.

2

Hi,

When you are merging a branch, it happens a the changeset level. Every merge has 3 contributors: source, destination and base (common ancestor between them).

You cannot decide what files/folders to merge but you are merging the whole changeset.
https://docs.plasticscm.com/book/#_merge_and_conflict_resolution

Regards,
Carlos.

3

Thank you for the swift answer. We’ll organize our data to work with this in mind.