version-control

问题 This is driving me crazy and has resulted in lost work (not much, at least). Normally, when I edit a file in Visual Studio, it's supposed to automatically check that file out in source safe. On multi-project solutions (e.g., web app with class libraries), sometimes none of the files in one project would automatically get checked out, though exiting & reloading visual studio may fix that problem temporarily. Furthermore, project files are never automatically checked out. Whenever I add/remove

问题 I've got a git repo where some files differ in name by case only across branches. As a simplified example, in master, there's a file alpha/beta/foo.cpp and in branch bar , there's a file alpha/beta/Foo.cpp . The problem is that when I attempt to switch branches, git won't allow me to do it. There's an error that I don't have handy at the moment, but it basically looks like changes to file alpha/beta/Foo.cpp would be overwritten -- aborting even though a subsequent git status shows the working

问题 There are formats that are actually zip files in disguise, e.g. docx or odt. If I store them directly in version control, they are handled as binary files. My ideal solution would be have a hook that creates a foo.docx/ directory for each foo.docx files before commit, unzipping all files into it optionally, have a hook that reindents the xml files have a hook that recreates foo.docx from the stored files after update I don't want the docx files themselves to be version-controlled. (I am aware

问题 There are formats that are actually zip files in disguise, e.g. docx or odt. If I store them directly in version control, they are handled as binary files. My ideal solution would be have a hook that creates a foo.docx/ directory for each foo.docx files before commit, unzipping all files into it optionally, have a hook that reindents the xml files have a hook that recreates foo.docx from the stored files after update I don't want the docx files themselves to be version-controlled. (I am aware

问题 My Git repository claims there is a corrupted object: running git fsck --full says that there's a corrupted loose object in the repo. Since the object is corrupted, I can't unpack it using git cat-file -t , but removing the file causes fsck to report only: broken link from tree 93e54230ef... to tree 5aec4ad... missing tree 5aec4ad... I think this missing tree is the only file that is missing, or rather that there are no dangling commits/blobs, because running git ls-tree 93e54230ef... shows

问题 My Git repository claims there is a corrupted object: running git fsck --full says that there's a corrupted loose object in the repo. Since the object is corrupted, I can't unpack it using git cat-file -t , but removing the file causes fsck to report only: broken link from tree 93e54230ef... to tree 5aec4ad... missing tree 5aec4ad... I think this missing tree is the only file that is missing, or rather that there are no dangling commits/blobs, because running git ls-tree 93e54230ef... shows

问题 Make is purely timestamp-oriented: if a source is older than its target, the target gets rebuilt. This can cause long recompilations in big applications if one does some major version control detour. Let me give you an example. Suppose I have an old feature branch which didn't get merged yet, and I want to see how it's doing. So starting from master, I would checkout that branch, then merge master into it, then compile. All very fine, and if the feature was small, then differences vs. master

问题 Closed. This question is off-topic. It is not currently accepting answers. Want to improve this question? Update the question so it's on-topic for Stack Overflow. Closed 5 years ago . Can anyone recommend a proven combination of a hosted Subversion solution and supported Visual Studio plug-in? I like what wush.net offers as far as a service, and I like VisualSVN as an IDE plug-in, but it doesn't look like wush.net supports access via VisualSVN / TortoiseSVN. Any suggestions? Thanks! 回答1: Wush

问题 Help! I need to recover a branch. I've been using git with the Bitbucket UI to try and simplify things, but missed a checked checkbox... What I did: I created a pull request and merged my feature branch into the dev branch, closing the feature branch (desired outcome). I then created a pull request and merged my dev branch into the staging branch (desired), but I missed that the checkbox was still marked to "close branch on merge", which happened (not desired). What I want: I would like to

问题 I don't want any non-functional changes like spacing, new lines, tabs in my commits. I used to use SVN which had a UI showing 2 screens (old file on left, file I'm about to commit on right) that let me quickly go through all my changes (down arrow) and change which way the arrow pointed (right meant commit it, left meant revert it back to how it was). What are some similar, or even better ways to solve this problem in git? 回答1: A setting like this one would do the trick: git config apply