Hi all, Does anyone have experience in using SDF together with Git? Let me explain what I was trying to implement until I hit a blocker: • Master branch - tagged commit with just the SDF Project and blank directory structure; second commit is the up to date SDF download of NS Prod • Feature Branches - created from the Master branch tagged empty commit • QA branch - create from latest Master Branch commit Feature branch : 1. download scripts and objects from NS SB via SDF 2. PR to QA , SDF deployment to QA SB 3. PR to Master, SDF deployment to Prod Now the issue is that for every change I'm getting a conflict on the PRs even though these are the actual changes that I want to merge.

conflicts in GIT are likely orthogonal to SDF itself

I agree. So I'm beginning to think GIT is not a way to go with SDF projects and we'll have to go for SVN. What do you think?

I don't think the choice of version control system is the issue

Might it be the environment change. try to ignore project.json ?

It's detecting any object or script change as a conflict @Lander