version-control

Proper way to avoid asking for password on every pull on production server

牧云@^-^@ 提交于 2019-12-13 21:51:42
问题 I cloned repository from bitbucket but with my username like git pull username@repository.blah now it asks me for my bitbucket password every time. Now other developers want to pull too, but what should I do to make it easy for every developer. 回答1: You should use SSH (not HTTPS): git clone git@bitbucket.org:<your-usert>/<your-repo>.git Create ssh key files using ssh-keygen utility (all questions you may answer yes ). Add a public key content to User->Butbucket settings->SSH keys. Now you can

Why does git pull origin develop --rebase cause conflict when git pull origin develop doesn't?

余生长醉 提交于 2019-12-13 18:18:51
问题 Now normally I use git pull origin develop into get the latest updates from the develop branch. Recently, my team has been transitioning into using rebase instead of merging so I'm a bit confused on some stuff. Before my workflow is pretty straight forward. I would first checkout into the develop branch and use git checkout -b feature/foo I would then make my changes, commit and then push them. Usually the develop branch would have some changes made thus, I would use git pull origin develop

Versioning file name using Python

我的梦境 提交于 2019-12-13 17:15:52
问题 Basically when I download a file, it should check whether the file exists or not. If not exits rename the file with the version-0 else if exists rename the file with the next iterating version (eg- it should be file-name-version-1) Here is what I have tried: def VersionFile(file_spec, vtype='copy'): import os, shutil ok = 0 if os.path.isfile(file_spec): # or do other error checking... if vtype not in ('copy', 'rename'): vtype = 'copy' # determine root file name so the extension doesn't get

Xcode delete working copies of source control

大憨熊 提交于 2019-12-13 17:05:59
问题 I am trying to delete a working copy of my project, I came across this answer Xcode Source Control showing multiple Working Copies But seems that in Xcode 7.3.1 ( I don't know which version they change it) there is no file "xcshareddata" mentioned in the answer So I don't know how to achieve it in my Xcode 回答1: First please select shared in manage scheme: set the active scheme (next to stop button) -> manage schemes -> click the scheme -> edit -> select shared in the bottom of the window Then

SVN common code with externals

泪湿孤枕 提交于 2019-12-13 17:00:20
问题 At the moment I'm trying to set up a repository for multiple products using the same code. The best solution would be to make real libs of the shared code and use them that way. However this takes way to much time at the moment. The idea is to have a single repository with the following tree -trunk-Project1 -Project2 -Shared Project 1 and 2 both have a external to include the shared code. The external points to a specific revision to not break project2 build while working on project1 and the

The following untracked working tree files would be overwritten by

筅森魡賤 提交于 2019-12-13 16:29:11
问题 after trying to branch a remote branch to my workplace, I get the following error: **$ git checkout -b canc_el --track origin/canc** error: The following untracked working tree files would be overwritten by checkout: src/iphone/FacebookSDK.framework/Headers src/iphone/FacebookSDK.framework/Resources src/iphone/FacebookSDK.framework/Versions/Current src/iphone/Xcode/Crashlytics.framework/Headers Please move or remove them before you can switch branches. Aborting That's strange. I haven't

Remove project from SCM in Xcode

懵懂的女人 提交于 2019-12-13 14:43:04
问题 I have an iphone project on a mac. I set up an SCM repository and then ignored it for a while. Now I've decided to back up my source to my main PC and do source control there. I'm finding that the SCM wants to roll back my changes seemingly at random. How can I kill SCM in Xcode on the mac? I need to tell it to leave my source files alone. Nothing is worse than making changes and having your changes replaced. I work alone, but have about 10 projects in source control on the pc. Thanks, Gerry

Git local branch accessible for coworker

99封情书 提交于 2019-12-13 14:31:49
问题 Bob, Ben and Mike are working on an awesome project. Bob has created a local branch named foo. Bob will share branch foo with Ben, so Ben can pull and push to it. Bob don't want show this branch to Mike. Bob don't want push this branch to origin. What is the simplest setup for such scenario ? 回答1: The easiest way to manage authorization access remains adding an extra layer like Gitolite on your own repo, in order to manage branch access rights. 回答2: If these repositories are on the developers

Jenkins Changes link

老子叫甜甜 提交于 2019-12-13 14:24:33
问题 What is the purpose of the "Changes" link in the Jenkins UI? Can anyone point to the Jenkins documentation that describes the "Changes" link? 回答1: When Jenkins pull the source code, it get a new SVN revision or a new Git SHA1. This link displays the SCM changes since the last build: 来源: https://stackoverflow.com/questions/33549206/jenkins-changes-link

What is a sensible structure for multiple-language project in source control?

不想你离开。 提交于 2019-12-13 13:40:53
问题 At work we're developing a large-scale application with quite a few front-end, back-end and support components. Typically the front-end is developed in C# and the back-end is developed in Java, although parts of the back-end are also developed in C# and possibly later C++. The choice of language and platform is not arbitrary; we try to weigh the relative merits of each in development time, tool-chain cost, familiarity with the language by the specific development team etc. What all these