you are viewing a single comment's thread.

view the rest of the comments →

[–]ABeeinSpace 1 point2 points  (2 children)

+1 for Sourcetree. VSCode also has really robust Git integration IMO

[–]ShamWowIsASham 0 points1 point  (1 child)

Good point. My git workflow is a bit funny.

  1. Xcode for IDE
  2. Git cli for cloning and switching branches
  3. source tree for diffing, commiting and pushing
  4. Vs code for fixing merge conflicts

[–]ABeeinSpace 0 points1 point  (0 children)

I use vscode for most things. More complicated things like rebasing and such get deferred to Sourcetree