git integration

is there a way to compare the local version with the master repository? as i noticed the 'compare' entries all compare to the local repository.

7 comments
Comment actions Permalink

Hi Rurik,

Could you please clarify, what do you mean by the "master repository"?

If you mean the version of the file as it is in the tracked branch of the current branch (origin/master if you're on master), you may use "Compare with the latest repository version".

0
Comment actions Permalink

Hi Kirill,

yes that is exactly what I mean. But "Compare with the latest repository version" doesn't work if I haven't pulled before.

0
Comment actions Permalink

It is not possible to get a non-fetched version of a file in Git. Git itself doesn't provide any mechanism to do so. So you'll have to Fetch (or Update Project or Pull - both include fetch inside) and then compare.

You may also want to vote for IDEA-92245 which is somewhat related.

0
Comment actions Permalink

i'm quite new to git, i've worked with cvs and svn before. and i used to compare to the repository before updating to see what i'm getting. so you are saying this is not possible in git? this would explain why i did not find this function in tower :(

0
Comment actions Permalink

You may fetch. That won't change your working copy. You may fetch, and then check everything and update only if needed.
Btw, Git is very safe and flexible, so usually you can always rollback if needed.
If you're new to Git you may find useful to take a look at the Pro Git book. It is very good and easy-to-read.

0
Comment actions Permalink

thank you very much, that was very helpful :)

0
Comment actions Permalink

@kirill : i must say that your git integration is nothing short of spectacular, as good as i could have expected from JetBrains. When i get stuck (usually my ignorance of some of AppCode's features), i use SourceTree found here http://www.sourcetreeapp.com  ... Since switching to AppCode, i am practically never going to command-line git. Kudos :)

0

Please sign in to leave a comment.