Git Branch Configurations Gone in 98.486?

In the previous build, there was a selectable menu on the bottom toolbar that allowed me to easily switch between the different branches I had configured. For instance, if I was tracking "master", "JIRA-123" and "mybranch", I would be able to select which of the three I wanted and it would change the working branch as well as do some other necessary configuration. Upon starting up 98.486, the toolbar has become a read only indicator (see below), without the other branches I'm tracking and without the other menu options which had been available.

My question is whether this feature was removed, moved, being reworked or just hiding because of some configuration issue.

I'm running on MacOSX.

--Tim

git-config.png

6 comments

Hello Tim,

This feature will be reworked and reintroduced after the IntelliJ IDEA 10
release. Its implementation that existed in the EAP builds was quite complicated
and confusing, but unfortunately we didn't have time to redesign it properly
before the release.

In the previous build, there was a selectable menu on the bottom
toolbar that allowed me to easily switch between the different
branches I had configured. For instance, if I was tracking "master",
"JIRA-123" and "mybranch", I would be able to select which of the
three I wanted and it would change the working branch as well as do
some other necessary configuration. Upon starting up 98.486, the
toolbar has become a read only indicator (see below), without the
other branches I'm tracking and without the other menu options which
had been available.

My question is whether this feature was removed, moved, being reworked
or just hiding because of some configuration issue.

I'm running on MacOSX.


--
Dmitry Jemerov
Development Lead
JetBrains, Inc.
http://www.jetbrains.com/
"Develop with Pleasure!"


0

Thanks for the info.

And I'd like to agree about complicated and confusing, but once I finally got it configured correctly, it was pretty sweet and I think will be a huge win once it has been polished. I think with it and a few other pieces, Idea's git support will be best in class.

--Tim

0

That read-only branch name is sometimes missing (blank).  I'm not sure if I understood the choices previously there, switching between branches or configurations, but I would at least like to have a constantly visible indicator of what branch I'm working on.  I guess it's indicated by the + after the branch name in Changes > Log, and the HEAD label in the detail of that commit, but I'm wondering why the status bar area is sometimes blank.

Speaking of switching branches, which .idea files should I track in git versus ignoring?  I guess this is part of the complexity that still needs to be worked out.

0

Hello David,

That read-only branch name is sometimes missing (blank).  I'm not sure
if I understood the choices previously there, switching between
branches or configurations, but I would at least like to have a
constantly visible indicator of what branch I'm working on.  I guess
it's indicated by the + after the branch name in Changes > Log, and
the HEAD label in the detail of that commit, but I'm wondering why the
status bar area is sometimes blank.


The blank indicator seems to be a bug (unless you see it in specific situations,
like, for example, in the middle of a rebase). Please file a YouTrack issue
with more information.

Speaking of switching branches, which .idea files should I track in
git versus ignoring?  I guess this is part of the complexity that
still needs to be worked out.


workspace.xml and tasks.xml should be excluded; the rest is OK for versioning.
This is documented in the help system and in the knowledge base.

--
Dmitry Jemerov
Development Lead
JetBrains, Inc.
http://www.jetbrains.com/
"Develop with Pleasure!"


0

I figured out the blank branch thing.  It's blank when the editor is in a library file; when I switch back to a project file, the branch name shows up.  I guess that's good, because those library source files are not tracked in git.

0

I'm quite glad its gone ( in its current form ) as it was always problematic, esp. how I'm using my project:

a) multiple git repoisitories open at once
b) creating/switching branches from the command line ( using the git-flow extensions to manage feature branches )

This always led IDEA to getting in a confused state as it would change the branch for the branch configuration and want you to save or alter it.  The UI was kinda confusing I found.

0

Please sign in to leave a comment.