I'm going through Rider tutorials and VCS tutorial seems to claim that upon right-clicking on the unstaged file/directory there should be an option to add it to ignore list; however it's missing in my case (see screenshot).
Screenshot from tutorial
Git plugin is enabled. Is there any option I need enabled in VCS settings that I'm missing? Thanks!
In version 2019.2, Rider's VCS client was updated so that you can now ignore files using the native Git mechanism of .gitignore files. Unfortunately this tutorial was not updated accordingly.
We'll update the tutorial in the next version. In the meantime, you can find the up-to-date version of this tutorial in Rider's online help.
Related
After committing all changes to my SVN repository, I always see "incoming change" on my folders.
I have found similar posts here on StackOverflow, but none ended with a solution. Someone did mention that their repository was set up incorrectly, but did not elaborate.
Any ideas where I can begin investigating?
I am using Juno Service Release 1 Build id: 20120920-0800 and SVN version 1.6 with the following plug-ins:
You must have the Subclipse feature to Show Out of Date folders turned on (it is not on by default). This blog post describes the feature:
http://markphip.blogspot.com/2006/12/subclipse-synchronize-feature-show-out.html
I generally do not recommend using it, which is why the preference is off by default.
Recently I tried out the new TFS-Service, and really liked the built in Scrum template for project management, and the new ability to create a team project managed with Git.
It would seem that the Git integration is only possible when using Visual Studio on windows though. Using Eclipse (with the Team Explorer plugin) I was unable to work with a git-based team project.
Is this really the case?
Heres what I've tried:
In TFS Service, I have a git-based team project with some commits in it.
In Eclipse, I connected to the team project, but it seems I can't pull or even see the source in any way. Source control explorer doesn't show any code (or any paths even).
In TFS, I created a new git-based team project. In Eclipse I created a new project and used Team -> Share... to try and get the code into TFS. But selecting TFS there doesn't seem to have the disired effect: it doesn't understand that it's a git-based team project, and so it doesn't try to push the code with git, but upload it to a new path ($/some/path/here/).
So is that it, or perhaps there's a workaround? Maybe I did something wrong?
BTW - I know about using TFS with git-tf, and I'm OK with that option, but it's not what I'm asking.
Thanks.
We're working on improving this for the next major version of Team Explorer Everywhere (TEE), but this is what you'll want to do today.
Eclipse already has a full featured Git version control provider in the eGit plugin. This is installed in many versions of Eclipse but if you do not have it you can install it from here:
http://marketplace.eclipse.org/node/1336
To use eGit today against the hosted service you must enable alternate credentials in TFS (click on your name in the top right corner, My Profile, Credentials then enable and configure your credentials).
Once this is enabled you can point eGit at your service account repo and you are good to go. In the Import or Share wizards pick Git and then follow through th eGit dialogs.
When you make a commit, if you add #123 into the work item comment it will associate the commit with that work item number when you push it to the server.
Now, I mentioned that we are trying to make this better. What we are aiming to do is show you both your TFVC and your Git related projects when you import and share and if you have picked a Git repo then we'll help you get your credentials set up, clone it and get the version control parts of Eclipse hooked up to eGit (assuming you have eGit installed). We'll also make sure that the other Team Explorer Views (such as work items, builds etc) all work great and that links to Git commits etc do the right thing. Hope that makes sense - but if anyone wants to talk more about how Git projects will work in future versions of Team Explorer Everywhere then feel free to drop me a mail (martinwo#microsoft.com)
So I have a project I created a year or so ago and I've been manually saving the files to an external hard drive every new version. With Xcode 4.2, source control is now totally integrated into Xcode. Or so I thought. The problem I have in not creating the git repo (see below) but getting it to work with Version Control.
In my directory (cd in) I did the following to create a git repository. I see it as such in the Organizer in Xcode and in Github for Mac. It truly is a git repo.
git init
git add .
git commit -m 'First commit'
But in Xcode, when I change a file, there is no M or A badge or otherwise that appears to let me know it's been changed. What's more, the source control contextual menu items are all disabled and thus entirely useless. I don't want to have to commit or revert in the Organizer or command line every time.
How do I enable this part of version control in Xcode? Some tag I add to the .xcodeproj file? A bool somewhere? A setting somewhere? Anyone know? Thanks!
So I figured out the problem. I had to clean the project before it would show me the badges. I restarted Xcode after that as well, which may or may not have helped. In any case, after that, it worked perfectly.
I have also found a new clean linked repo to be the answer. Simply drag the whole folder containing the xcode proj file into the Git workspace and follow the prompts. After that all is linked and cool. That said I am aware that there may be more elegant solutions and answers.
I have been using the built in mercurial support in NetBeans for a while now and its great. I just recently installed MercurialEclipse from http://cbes.javaforge.com/update so I can start using Mercurial for my Flex projects as well.
I can't seem to figure out how to use it.
I watched the video, when I right click files in the Package Explorer and go to tools I only have 2 or 3 options: Apply Patch, Share Project [, Show Local History]
When I click show local history, it says:
No local history for selected resource.
My project is a repository and I have made some changes since the last commit. I would like to see a diff of those changes so I can review them before committing.
Is this possible?
You need to click "Share Project" and enable Mercurial support for this project.
As per the EGit User Guide, to use the merge tool, one should right-click on the resource with a merge conflict and then select Team > Merge Tool. However, when I do this, the Merge Tool option is greyed out. EGit is properly detecting the conflict and showing me both the icon and text label decorations for the file in conflict.
Any ideas?
It was disabled for me because I had some changes on my stash list.
$ git stash clear
fixed the problem for me.
It can depend on the version of EGit you are using, and on the operation that lead to the conflict.
See for instance bug 339092 which mention merge tool being not enabled in the case of a conflict after cherry-picking: only the just released EGit 0.12 would support that.
The only time (other than a bug) that the Merge Tool would be disabled is that when you are in any status other than the Conflicts one; i.e. you will only see that option enabled when the status is Conflicts. The status is shown next to the project name in most views, such as Project Explorer and Synchronize.
Make sure you have merged with desired branch, then if your merge results in conflicts, your project will enter Conflicts mode, and the Merge Tool will be enabled.
It seems to be a bug in EGit as VonC mentioned, but the fix is easy. I did it using reset branch option on the same menu that Cherry Pick option existed.
Note: git stash clear didn't help.
This happens if you tried to push changes to a remote and there were merges required from the remote. It fails with 'not FF' but also simultaneously detects the conflict. Don't ask me why it doesn't mark the whole project as conflicted at this point.
Open the Synchronize tab, right-click the project and select 'merge'. This immediately fails because of the conflicting file, and it switches on the conflict icon label for the project and enables the 'merge tool' option.
This is for EGit 4.0.3 in Eclipse Mars.
This also happens if you're in detached head state (in my case, I had checked out a remote branch and then forgotten).
Also, even after you've corrected the problem, you may have to select a different project and then reselect the one you actually want (just selecting in the package explorer view) in order for the menu to update.