version-control

Visual Studio Code source control is full

情到浓时终转凉″ 提交于 2019-12-21 23:27:47
问题 I just started using GitHub and I think I messed up something in Visual Studio Code. As you can see on the Source Control screenshot it has 5000 changes and when I try to use Discard all changes or Unstage all changes functions, this error pops up: Git: warning: failed to remove AppData/Local/Comms/UnistoreDB/USS.jtx: Invalid argument This problem only occurs when I open one specific project, but never used any git commands on this project. 回答1: It seems you located the git repo in the wrong

Git Visual Studio with Bitbucket confluence Connect to existing project error / Fetch fails

无人久伴 提交于 2019-12-21 23:14:17
问题 How do you pull from existing Bitbucket GIT repo using Visual Studio 17? Error " git failed with a fatal error. 'xyz' repository not found " I added this Misty BitBucket Extension from the marketplace Then I added the Git remote string as below with three types of options and this help page. First I tried this string -> https://<repo_owner>@bitbucket.org/<accountname>/<reponame>.git & https://<repo_owner>@bitbucket.org/<accountname>/<reponame> then I tried the URL path based on youtube videos

Local branches show-up on GitHub's “Network” view

南楼画角 提交于 2019-12-21 22:17:22
问题 We are using Git and our workflow consists of a 'dev' and 'master' branch which lives on GitHub and each developer's local repository. No work is performed directly on 'master' or 'dev', but rather in local branches and only merges happen on 'dev' and later with 'master'. We do not push local branches to GitHub. For some reason developers' local branches show up in the "Network" view on GitHub and this clutters up the network diagram (I should point out that the branch itself doesn't exist

Mercurial: Getting changed files from revision?

岁酱吖の 提交于 2019-12-21 21:28:59
问题 I can't get my head around how I can get only the files that were changed in my last revision, and not the complete repo, which i get by using Clone. This would be super helpful to for instance, deploy the last changed files. What do I do? Thanks 回答1: Martin has the right way to get a list of what files have changed in a revision, and I've upvoted his answer, but just to expand on why your question is a little off: In Mercurial every location has a full copy with all changes. If you're going

How to use git for multiple developers

梦想的初衷 提交于 2019-12-21 21:22:23
问题 Here is very simple question for experienced Git user. I've created repository on git hosting and set up mine pc: git init git remote add origin git@*.sourcerepo.com:*/ *.git Then, after some changes I do: git add . git commit git push All these actions are done on first developer pc. Now the question: How does second developer access and take changes to repo? First of all he has to clone repo? 回答1: Yes, you would use clone. You also should be sure to set the sharedrepository config option:

Linking TFS source control folder from another TFS project

随声附和 提交于 2019-12-21 21:15:27
问题 We are moving to TFS 2010 (from PVCS) for source control and work item tracking As I understand it you should have under source control for each TFS project everything that projects solutions, etc. need to build. This OK for new .NET solutions/projects, but we have a large collection of legacy Delphi 6 projects with shared source libraries we want to port into TFS for source control and build. It is how we manage multiple TFS projects that want to sare a specific set of source files between

Is it bad to git rebase a local branch off of another branch that is itself rebased often?

陌路散爱 提交于 2019-12-21 20:24:12
问题 Say I have local branch A off of origin/master. I am continuously making changes to branch A, fetching the remote master, and rebasing. Then I have local branch B off of A. I am continuously making changes to branch B and rebasing. I am the only one working on branches A and B. Is this a bad setup since A's commit IDs (hashes) may be changing frequently? Does that destabilize branch B in any way or make conflicts more likely? In fact, how does Git even implement this setup? What is B's HEAD

PyCharm: versioning .idea folder while keeping different interpreters across developers

不想你离开。 提交于 2019-12-21 20:22:53
问题 We are using PyCharm as the Python IDE for a project. Developers use different kind of OS setup, e.g., python path is not the same for some of us (some have local interpreter stored at different location or remote interpreters). Unfortunately, python interpreter path is stored in the .idea PyCharm project folder (.iml file). It then leads to conflicts or python path overriding when merging branches with Mercurial. We would like to keep tracking under version control the .idea folder and the

Can I use git to manage a website even if other people update it without using git?

随声附和 提交于 2019-12-21 20:19:28
问题 So let's say I got a web server that I can access over ftp. Most people update it using dreamweaver, and I update by basically copying and pasting manually between my computer and the server. My question is, can I use git to manage the site (and not have to manually copy/paste), while other people update it using other methods? I can't install much on the server. I would like to only put files on the server to set this up. I do not want to have to manually copy and paste to upload to the

Manage project backend and frontend in two separate branches or repositories?

限于喜欢 提交于 2019-12-21 18:00:13
问题 I started a project of a mobile app that will have a server-side and the app itself. So, in the master branch I created 2 projects myapp_server and myapp and then I created 2 other branches backend and frontend and I want to push to the separate branches only the project files corresponding to them. But, f.e. in the backend branch, I want to put the project files only, without the parent folder myapp_server itself. Shall I make a git init for the separate branch inside of this project folder?