version-control

Is RedGate SQL Source Control for me? [closed]

人盡茶涼 提交于 2019-12-17 23:14:00
问题 Closed . This question is opinion-based. It is not currently accepting answers. Want to improve this question? Update the question so it can be answered with facts and citations by editing this post. Closed 5 years ago . I've just inherited an SQL Server database. One of the things I will need to sort out is versioning and automated builds. It has been suggested that I should think seriously about recommending RedGate SQL Compare, but I have to admit I am a little uneasy about it. My

How to Migrate Git Projects to Be One Project with Subprojects

落花浮王杯 提交于 2019-12-17 23:12:08
问题 I have a number of projects that are in separate Git repositories right now. They are, likewise, in separate eclipse projects (because I was unable to use parent projects using the Maven plugin for a long time due to bugs in the m2 plugin). Now that works. So I combined the projects in Maven, making a base pom project, adding that as the parent to the others. Then I nested the subprojects. When I went to commit the base project as a git project, it had decided that the subdirectories were

Find unadded files in Team Foundation Server

一笑奈何 提交于 2019-12-17 23:09:55
问题 We're using team foundation server for our source control. I frequently put files into my project (under source control) and forget to "add" them as far as TFS is concerned. There are also cases where TFS doesn't pick up new files (copy and paste a file in your project). Is there a way I can list all of the files that have not been marked as "add" so that I can verify that all of the intended check-ins take place? This is driving me crazy! We don't have continuous integration set up yet for

What is the 'standard' content of .gitignore for an iPhone (Xcode) project?

北城以北 提交于 2019-12-17 22:48:55
问题 What is considered the 'standard' content of .gitignore file for an iPhone (Xcode) project? PS: not sure if this needs to be a CW. 回答1: build/ .DS_Store **/*.pbxuser *.mode2v3 *.mode1v3 **/*.perspectivev* This is a good start. updated with Dave's suggestions. 回答2: You should also exclude xcworkspace and xcuserdata in xcode 4.2. So here is a complete list which one should ignore for iOS projects # Exclude the build directory build/* # Exclude temp nibs and swap files *~.nib *.swp # Exclude OS

Visual Studio 2008 source control for small teams

帅比萌擦擦* 提交于 2019-12-17 22:34:35
问题 I work on a small web team where I am the only .NET developer currently using Visual Studio 2008 Professional to build and maintain a few web applications. I am about to start training another member of our team so we purchased him a copy of Visual Studio 2008 Professional. I've looked into Visual Source Safe, but I'm dubious. I don't like that is file system based. Ideally, the system would work with SQL Server 2005 and plug into Visual Studio. Windows based solutions are the best because of

How to avoid git conflicts in a team?

故事扮演 提交于 2019-12-17 22:29:14
问题 We are some developers who work on same project and we use git for the project. If two or more of us happen to work on same file, we receive git conflicts which are hard to deal with, sometimes changes done by one developer are lost when these conflicts happen. How do they work with git in a team? What should be the proper flow in order to avoid git conflicts ? Thanks in advance. 回答1: Before you dig deep into your workflow, before you spend a moment of time or a dollar of money rebuilding

For home projects, can Mercurial or Git (or other DVCS) provide more advantages over Subversion? [closed]

孤街浪徒 提交于 2019-12-17 21:58:12
问题 Closed . This question is opinion-based. It is not currently accepting answers. Want to improve this question? Update the question so it can be answered with facts and citations by editing this post. Closed last year . Which free source control system is most preferable with reason for home projects and documents? I am thinking to use Subversion (as I am familiar with it). Characteristic of home project: Most likely single person will be committing changes. (May be one day (not now), it is

What .net files should be excluded from source control?

半城伤御伤魂 提交于 2019-12-17 21:58:05
问题 What file extensions from a .net application should be excluded from source control and why please? 回答1: Depends on the project, but I've got the following for a Silverlight + WPF project in my .gitignore: # Visual Studio left-overs *.suo # 'user' settings like 'which file is open in Visual Studio' *.ncb # Used for debugging *.user *.ccscc # Used for versioning *.cache # Editor left-overs *~ # (x)emacs *.bak # Windows related \#*\# # (x)emacs *.orig # Own usage # Compiled files */bin/ */obj/

No submodule mapping found in .gitmodules for path

半世苍凉 提交于 2019-12-17 21:55:52
问题 When I run git submodule update No submodule mapping found in .gitmodules for path 'Classes/lib/AFKissXMLRequestOperation' But I have no submodule Classes/lib/AFKissXMLRequestOperation in current repos My git config is: [core] repositoryformatversion = 0 filemode = true bare = false logallrefupdates = true ignorecase = true precomposeunicode = false [remote "origin"] fetch = +refs/heads/*:refs/remotes/origin/* url = git@github.com:why_ios.git [branch "master"] remote = origin merge = refs

.gitignore doesn't ignore files

梦想与她 提交于 2019-12-17 21:55:35
问题 My .gitignore file gets ignored and the files which should be ignored are still visible. user@host ~/workdir % git status # On branch master # Changed but not updated: # (use "git add <file>..." to update what will be committed) # (use "git checkout -- <file>..." to discard changes in working directory) # # modified: .htaccess # modified: application/controllers/statistics.php # no changes added to commit (use "git add" and/or "git commit -a") user@host ~/workdir % cat .gitignore .htaccess