For some reason, source tree does not show the listing of files in my commit. I am on the "Workspace->History" view, It's set to "All Branches", "Show Remote Branches" and "Ancestral Order".
The tree shows up fine.
Under that, it shows me commit description, SHA1, parents, author, date, labels. On the right, it shows me only the diff of only one of files in the commit.
If I drag up the lower border, I can see the Command History.
If I create and stage new files, I do see them appear in the lower portion of the view in "Staged files" and "Unstaged files", and I can click on each file, and the diff on the right shows the differences. But once I commit, I can no longer see the file listing.
I know that all the files are committed as I see them in ls-files, it seems like I'm missing an option or preference somewhere in the tool. Anyone know what I'm referring to?
Wow. I did not realize there was a table with "Filename / Path" headers. On a mac at least, you can resize the contents of the table to a 0 height, so that it completely disappears and there is no way to bring it back without hovering over with a mouse.
Related
After exploring a few models, I generally want to delete those I don't need. How can I do that in BlueSky Statistics? Clicking on the section heading e.g. "Regression" doesn't select that section. I've tried right-clicking on that and choosing delete, but it just deletes the title, not the section.
At the moment, to actually delete an entire section of output, you have to do it one table at a time as you've discovered. That is, you right-click it and choose "Delete." The usual combinations of Shift-click and CTRL-click to choose many tables at once are not currently supported. The developers are aware of this problem and say it'll be fixed in a future release.
However, there is an alternative approach. In the Output Viewer, you can go to the Layout menu and choose "Show Navigation Tree", a series of check-boxes will appear by every piece of output. By un-checking a box, you can hide any table you don't want to see without having to delete it.
When I view the 'Show Log' in Tortoisegit, some of the revisions are shown without a node/bullet in Graph. What does that mean?
In the log dialog all revisions (except working tree changes - as these are uncommitted) have a bullet indicating on which „branch“ they are located.
It can happen, however, that the column is not wide enough.
I am trying to merge a new version into the release branch. I got about 38 conflicts and I sort of get rid of them by selecting the file and clicking the third button at the bottom center saying to use the right file for the merge.
Yet there are three files left: a .xib, the project.pbxproj and a normal .m file that whatever button I push the red C does not disappear and the merge button remains dimmed.
What must I do to also merge those files and thereafter merge the whole project?
Thanks,
Fabrizio
File by file with a lot of work I fixed it. Surely if each time I need to merge two files I need an evening work, that is not a nice operation to execute!
The documentation is here: http://www.kernel.org/pub/software/scm/git/docs/git-mergetool.html
A handy guide is here: http://ryanflorence.com/git-for-beginners/
However, neither of them explain how to use mergetool's filemerge.
The guide I read says "I hit enter and FileMerge pops up and I deal with the conflicts:" but it doesn't mention how to "deal with the conflicts".
When I run:
git mergetool
:and then hit return as prompted, and the filemerge window opens showing all the merge conflicts, it only responds to the commands cmd+D and cmd+shift+D (which allow cycling through the conflicts). However, there doesn't seem to be a mention of how to, for each conflict, choose left/right/neither. The combo-box dropdown does not seem to do anything.
Have already looked at docs, guide, file system menu, and systematically pressed keys on the keyboard looking for a response =)
I haven't found any official documentation for it, but here's the understanding I got from trial and error:
There's a split view with your two options on the left and right. You can't edit either of those. There's also a bottom view which you can edit. You might need to pull up on the little circle in the middle of the bottom of the screen to expand that section.
For each conflict, click on the area in middle of the left/right split view and choose from the drop down in the lower right either "Choose Left" if the left is what you want or "Choose Right" if that is what you want. If neither option is good, click "Choose Neither" and edit it in the bottom section.
There's an arrow in the middle column that will show whether you've chosen left or right by pointing at it. If you've chosen neither, the arrow will disappear. All three views scroll together using the scroll bar on the far right screen.
When you're done, click File > Save Merge from the menubar.
Often, when I am reading code or debugging, I want the ability to quickly jump around files. I especially want to "go back" to where I was. I know about "Command+T", "Command+Shift+T", and, bookmarks. But, I cannot figure out a way to jump around files quickly.
UPDATE: I do not think I my question was clear enough judging by two answers given. Specifically, I am looking for a way to "jump back" to where I was in a file. I know how to navigate in TextMate (in general). I want to know if TextMate has a "jump back" key binding.
It's subtle.
The command-T thing has the files listed in Most Recently Used order.
So, you can go command-T return to get back to your last file real quick. At first I couldn't find it either.
I don't think there's a go to last edit location as there is in, say, IDEA/RubyMine.
Courtesy of MacroMates.com
2.3 Moving Between Files (With Grace)
When working with projects there are a few ways to move between the open files.
The most straightforward way is by clicking on the file tab you need. This can also be done from the keyboard by pressing ⌘1-9, which will switch to file tab 1-9.
You can also use ⌥⌘← and ⌥⌘→ to select the file tab to the left or right of the current one.
It is possible to re-arrange the file tabs by using the mouse to drag-sort them (click and hold the mouse button on a tab and then drag it to the new location). This should make it possible to arrange them so that keyboard switching is more natural.
One more key is ⌥⌘↑ which cycles through text files with the same base name as the current file. This is mainly useful when working with languages which have an interface file (header) and implementation file (source).
When you want to move to a file which is not open you can use the Go to File… action in the Navigation menu (bound to ⌘T). This opens a window like the one shown below.
Go To File
This window lists all text files in the project sorted by last use, which means pressing return will open (or go to) the last file you worked on. So using it this way makes for easy switching to the most recently used file.
You can enter a filter string to narrow down the number of files shown. This filter string is matched against the filenames as an abbreviation and the files are sorted according to how well they match the given abbreviation. For example in the picture above the filter string is otv and TextMate determines that OakTextView.h is the best match for that (by placing it at the top).
The file I want is OakTextView.mm which ranks as #2. But since I have already corrected it in the past, TextMate has learned that this is the match that should go together with the otv filter string, i.e. it is adaptive and learns from your usage patterns.
If you have a project window open, you can leave frequently-accessed files open (in tabs), and then use ⌘+1-9 to jump to open tabs.