Re: Inspectors in Right Hand Pane Have Dissapeared ....
Re: Inspectors in Right Hand Pane Have Dissapeared ....
- Subject: Re: Inspectors in Right Hand Pane Have Dissapeared ....
- From: Luther Baker <email@hidden>
- Date: Wed, 26 Apr 2017 00:28:57 -0500
Hey Alex,
> Using SourceTree also screws up the xcblueprint by ignoring it
For what it is worth, SourceTree is agnostic to the tech stack. SourceTree doesn't ignore files arbitrarily. SourceTree is simply a GUI built on top of Git. If files are being ignored - it is because the underlying Git repo has been configured to ignore them. There are several ways to do this ... (.gitignore, git update-index ...)
> Today, I had 2 merge conflicts with pretty useless files. Tried to resolve using SourceTree. Project was left unopenable. Couldn't cancel the merge, couldn't reverse any commits. I ended up deleting my project,
To avoid this type of catastrophe in the future ... one suggestion for you would be to consider wrapping your head around "command line Git".
Git functionality is pretty wide. While SourceTree can be very convenient for certain tasks (like visually diff'ing files, checking in partial file blocks and seeing branch lines) - wholly depending on a GUI to manage your Git repo is inherently risky. You could have fixed the problem if you really understood the state that the repo was in. SourceTree didn't break the repo - but it left it in a state the perplexed you ... to which the way out was not obvious. And don't worry, we've all faced that. Git is just so flexible/versatile ... any GUI is going to be limited in that respect.
Soooo ... put the GUI aside for a month :-) Force yourself to use command line only. You don't need Xcode and you don't need SourceTree to use Git. Get to know Git. Work on merging. Understand what an interactive rebase is. Figure out why you should commit often, when to branch and how to tag. Start a merge -- and then bail on it. Delete files that you've already committed, commit the changes ... and then re-add them to the repo. Push commits and then try to change the comments on the remote repo. Git is a fantastic tool ... master it. Don't let yourself get into a situation where you blame a tool for the loss of your code - it doesn't have to be that way.
Given how much work I know you do ... I'd strongly suggest you buckle down and figure out how to solve those Git problems on the command line. There's an art-form in there that is GUI agnostic.
THEN ... use SourceTree for the conveniences it affords - but don't expect it to do everything. Repos sometimes need to managed laser precision. You may find value in working towards better understanding how to be a surgeon :-)
At any rate ... keep on coding!
-Luther
_______________________________________________
Do not post admin requests to the list. They will be ignored.
Xcode-users mailing list (email@hidden)
Help/Unsubscribe/Update your Subscription:
This email sent to email@hidden