I have been using EGit to upload my stuff to github for a few months now.
But off late I do not see what files have been changed, and I dont know why. Please help.
As you can see I have updated some files and I cannot see a list of files in the files section.
This looks like a problem with Mac OS X 10.10 and SWT, see Eclipse bug 446534 for details.
Note that the heading above the table says "Files (1/1)", so EGit calculated the changed files correctly, but it isn't visible. Try if resizing the window makes it appear.
The Git Staging view, which is another way to commit using EGit doesn't seem to have the same problem. Maybe you could consider using that instead of the Commit dialog, see the user guide.
As the comment 2 at the Eclipse bug 446534 mentioned, calling table.pack() will solve this problem for a single tableviewer.
Related
I've reinstalled my PC and tried connecting back up to my Azure DevOps Repo using VS Code and TFVC. I'm using TFVC Location with Visual Studio 2019 Community TF.exe. It all seems to work and I can connect to my repo with my credentials. It all seems to load up fine and I can even see TFVC with a number of changes/differences. - see image below. However I'm expecting to see my source control and list of files to commit like before. But the panel is blank. There's no errors in the Output window of VS Code either.
I've tried removing and re-adding the workspace. Tried editing/adding anew file to the project in hope of kickstarting TFVC pane to show the file list. - the number next to TFVC updates but I don't see any menu button or files list.
Has anyone else had this and know a solution, or know where I'm going wrong.
Just toggle "scm.alwaysShowProviders" on and off from whatever value your have (default is false), this would cause the source control pane to redraw and fix the issue for now.
I believe per the issues in GitHub that this issue is fixed for most people as of VSCode version 1.39.2, but I was still seeing it for projects based on a Git repo.
After some trial and error I found this setting was the culprit: "scm.alwaysShowProviders": true
When I remove that setting, or set it to false, my Source Control pane works correctly.
This happens to me occasionally. I just figured out I can fix this by right clicking in the blank area and then selecting the repository I want to show up
Issue opened on GitHub: https://github.com/microsoft/vscode/issues/82374
For now I've rolled back to the August update and that's resolved it.
Clicking the blank area and slecting repo does the trick
I had this problem on the 1.55 version, as it's centrally controlled I couldn't manually update, but when they pushed the 1.64 version through, the problem has gone away, was driving me mad!
I am using Subclipse 1.10.13 and have a shortcut for committing changes of the current file.
The only thing I'm missing is a shortcut for commiting the changes of all files of the current project, not only the selected file.
Is there any possibility to do this?
Thanks in advance!
Ben
PS: I have googled around a bit before this posting and found stuff like http://subclipse.tigris.org/issues/show_bug.cgi?id=394 - but this doesn't help me unfortunately :)
The commit action is based on the context of the current selection, so I do not think so. You might try from the Synchronize view as I believe it has a toolbar action to commit everything regardless of what is selected.
I been trying to follow this tutorial on using Eclipse and GITHUB when multiple people are writing within the same project using branches. I believe I understand everything and how its working.. HOWEVER.. my hash isn't updating like the video is showing on local branches.
https://www.youtube.com/watch?v=KfeqnernMmE
If you look at minute 3:50 - 3:60 you will see him do a COMMIT and it will then update on the local branch and generates a new HASH etc...(text in grey next to ChangeDefaults in the video) My Eclipse won't freaking do this. I make a change exactly like he does, I do a commit, but my Hash's and comment text (all the text in GREY) don't update or change at all. They same the exact same as it was before and I'm not seeing any onscreen errors or anything.
What am I missing?
Apparently there were 2 things I was doing wrong.
1) I wasn't using the correct Repository when I was modifying things. I had the wrong "Project" open.
2) I was missing an update and had to update my GIT inside my eclipse.
I think I am just merely (coming from an SVN background) confused with how Git conflicts are handled by EGit within Eclipse.
I understand that it shows textually in the normal standard method by which to show conflicts as stated here: http://www.kernel.org/pub/software/scm/git/docs/git-merge.html#_how_conflicts_are_presented however it isn't very clean and with thousands of lines of code it becomes unmanageable to avoid accidently deleting lines that are not meant to be deleted.
Is there any GUI within EGit that can show me each conflict with an step over ability?
I have searched around and I heard about the merge tool however when I follow the instructions by right clicking on the top level node of the tree (i.e. right click models folder that has the <> type icon denoting a conflict, which has a conflicted file of User.php within it) the merge tool is greyed out.
Am I using the merge tool wrong?
Edit
I found out that a bug can cause EGit merge tool to not show: Why is the merge tool disabled in Eclipse for a EGit-managed project? however I am using EGit 1.3.0 so I should be way past this bug.
I have given this question two days both here and on the EGit forums: http://www.eclipse.org/forums/index.php/t/371459/ unfortunately (even after everyone viewed it) no one had a real answer so I decided to solve my conflicts manually and just merge that way.
This way was, in reality, quicker and easier than trying to solve why the merge tools were not working for me, ironically.
I just did an svn merge from a branch to a trunk in my Eclipse IDE, and in the Merge Results view, there is this following icon:
alt text http://www.freeimagehosting.net/uploads/2a0a0f90b1.jpg
I am dying to know what it means. I have searched the entire Eclipse documentation and some relevant StackOverflow questions, but couldn't find anything.
The CollabNet documentation about Merge Results View explains what a Merge Results View is, but doesn't mention anything about the meanings of its icons.
Does anyone know? Thanks!
I believe that is the icon for a SVN tree-conflict which is new in SVN 1.6. Try doing Show Tree Conflicts option and see if the same items appear in the tree conflicts view. Also see:
http://blogs.open.collab.net/svn/2009/03/subversion-160-and-tree-conflicts.html
I've just hit up against the same thing.
After a bit of digging around I believe that it means there were changes to the file in both places however the changes are the same, therefore the files are the same.