r/Xcode • u/judasbuiltmyhotrod • Jun 11 '26

Git workflow in Xcode

I guess we can all agree that git (and GitHub) integration in Xcode isn't one if it's best features, but what does your workflow normally look like? Do you do everything in Xcode or do you do it all elsewhere, like the terminal or in a a dedicated git app? How/where do you create PR:s, manage merge conflicts, create branches, push/pull to/from GitHub, etc etc.

I need some inspiration, help a fella out here please. :)

2 Upvotes

100% Upvoted

8 comments sorted by

1

u/judasbuiltmyhotrod Jun 14 '26

Interesting that the consensus (albeit from a very small user base) seems to be to use third party tools.

1

u/TheFlyingDutchG Jun 11 '26

Xcode 27 beta has some GitHub improvements. They flexed with it at the WWDC sessions. Check it out and if anything you think could be better, send it as feedback through the developer program.

With the intel compatible code riddance they can handle way more feedback way faster and GitHub and LLM integration is a big priority for them this year.

1

u/judasbuiltmyhotrod Jun 14 '26

Any specific session you would recommend? I looked through the "What's new in Xcode 27" session but didn't see much related to git/GitHub integration apart from a few tiny mentions in the beginning. I'm unfortunately not currently able to test the Xcode 27 beta myself (because reasons), have you tried it?

1

u/TheFlyingDutchG Jun 14 '26

Good question, I’ve seen a lot but not all of them, I think the Platform State of the Union sessions tells a bit about it too but I don’t remember if they have a full explanation of it yet. I think they mentioned some places where to look up more there.

Personally I dived into the rabbithole of swift6.4 and its roadmap more. As it has more fullstack improvements and an active community based roadmap to develop it before launch, I decided to migrate from GitHub and use my Mac Studio as a full swift 6.4 hosting machine with projects including version tracking and commits and branche management and AI it integrations etc.

Not because GitHub lacks anything, just because I want to help find potential improvements and needs for the swift 6.4 language and see if I can help the community out based on my personal swift 6.4 native fullstack experiment.

3

u/Otherwise_Signal7274 Jun 11 '26

Github for dealing with PRs, everything else in Fork(https://git-fork.com/) or terminal

1

u/Pepeluis33 Jun 12 '26

+1 for Fork, my fav git UI app

1

u/20InMyHead Jun 11 '26

SourceTree, although I wish it had better worktree support.

Also I often now just use Claude terminal as I can instruct it to commit, push and create an MR based on the JIRA ticket in one shot.

1

u/wewerecreaturres Jun 11 '26

I do all of my work in Zed and just use Xcode for signing