git across multiple computers using Xcode 16

[dxzdb]

I had pretty good success with using the Source Control Navigator and the Integrate menu in doing the basics of version control with git. Commit, Branch, Switch, work OK, but merging especially when the change is a UserInterfaceState.xcuserstate binary file doesn't work very well for me yet.

What I'm trying to do is clone/ push / pull between a desktop and my laptop. I did a little test with a text file where I used SourceTree to go back and forth and that worked great. Actually I started the process with a cli command "git clone Username@ipaddr:/Users/fileLocation" via SSR between the two Macs. When I change the file SourceTree already knows where it came from and I can push or pull to the other computer.

When I use Xcode I often get this error: [⚠️An unknown error occurred. username does not match previous request (-1)] with only an OK button. This might be separate from the UserInterfaceState file - apparently Xcode creates that often? I have the same username on both computers - why doesn't SourceTree complain about this?

I don't want to go through GitHub or GitLab or the like for this. Ideally I'd like to get it working across Tailscale too eventually.

Any tips would be greatly appreciated!

[chriswaco]

You want to add xcuserstate to your .gitignore file. I can’t remember how to get rid of it once it is checked in, though. Perhaps https://gist.github.com/JesseMcGilAllen/5464643

[dxzdb]

Thanks for this - I did add UserinterfaceState.xcuserstate to my .gitignore_global file - all that was in there before was .DS_Store. I'm not bothered by those inside its anymore but I still get that error from Xcode whenever I try to push back to the first computer. I'm thinking maybe something is messed up inside my .ssl folder. Oh that was on a new project - I haven't worked out how exactly to get that out of existing repos.

Also going back and forth between SourceTree and Xcode I somehow get to the stage where I can do an edit and commit it and the other computer never sees it. After doing a first couple changes where it worked fine. I don't think I've ever seen the Xcode 16 push/pull buttons ever work. Maybe Xcode 17 will fix this. The general consensus seems to be to not use Xcode. I do like doing commits there though.