version-control

Git work flow with an inexperienced member

醉酒当歌 提交于 2019-12-21 17:52:39
问题 What would you suggest as a work flow when there is a inexperienced developer joins the team. I have been using git for my projects and now a new developer will join but he has not used any version control before. Project resides in Github and I have no way of pulling directly with him. We are both behind firewalls. Should I create a branch for him on github and merge it to master my self or do I ask him for patches at the end of the day. 回答1: I haven't worked much with github (I do use it,

Git hosting using an FTP-accessible web server?

梦想与她 提交于 2019-12-21 17:41:07
问题 I run a (terrible) website that's hosted on a third-party web server. I have FTP access to my web server. Git supposedly has the ability to push/pull via FTP natively. Since my web server is already accessible everywhere, I was hoping to use it as a centralized Git repository. I could push updates to it, then get them from anywhere. The problem is that when I try to push to it, I'm getting the following error: error: RETR response: 550 while accessing [insert my repository info here] 550

Apply multiple filters for same files in git

不打扰是莪最后的温柔 提交于 2019-12-21 17:37:38
问题 I am using Git for version control of local files, which finally have to be checked in into another version control system. Now I am experiencing some problems with most of the C code files: They all have an automatic version history in their header comment Most of the files are cluttered by EasyCode or EasyCase comments I now simply created two git filters "History" and "EasyTool" to clean up the code before being checked in to Git. How is it possible to filter all C and H files with both of

git setup for backup & sync between 2 computers

丶灬走出姿态 提交于 2019-12-21 17:15:46
问题 I'm new to git. Need some advise to know if my setup is correct. Please read below : I'm using git for 2 separate projects on my development computer and want to backup everything on a USB drive (setup as a git bare repo). Additionally, I want to sync these projects on another computer (for deployment). The 2 projects paths on computer1 are /machine1/path/proj1 /machine1/path/proj2 This is how I've setup (repeated exact same steps for proj2) #Initialize git repo cd /machine1/path/proj1 git

Which Version control system you would prefer for HTML, CSS, Javascript development for small team of Developers?

断了今生、忘了曾经 提交于 2019-12-21 17:11:53
问题 Which Version control system would be good for HTML, CSS, Javascript development for 4 Developers? We are 4 developers, all in different countries and we all have different Operating systems. 2 Developers have Macbooks, one has Windows 7 and another one has Ubuntu 9 linux) Some time on remote location we also do some changes in code using iphone and ipad using FTP On The Go PRO And some time some place Internet is not available so we also work without internet. I want to know the preferred

How to “revert” unchanged files with mercurial?

北慕城南 提交于 2019-12-21 16:52:09
问题 I have installed Windows7 on my computer, and I had to change all permissions/take ownership - which apparently "touched" all my files, and now everything appears to be "modified" (when I do "hg status"), but only some files have actual changes. Is there a command I can run so that I will either "commit" or "revert" all the files that have no actual change in them (i.e. text is unchanged, even if file attributes are changed). added: I've upgraded from WinXP to Win7. I didn't actually "copy"

How to revert/recover .m file to a previous version? (autosaved blank by mistake and xcode crashed - no Source Control, no Time Machine)

霸气de小男生 提交于 2019-12-21 16:34:01
问题 I've tried to search for the answer but I cannot precisely define the terms without falling under wrong threads all the time. What happened: Accidentally I've selected all the code inside a file.m and deleted it all. It became a full blank document . When I pressed Ctrl+Z to UNDO it, the xcode crashed . The problem: When I reopened the xcode (after the crash) , the file was still all blank ( It was autosaved seconds before the crash as a blank document ) - losing all my code . I could not use

SVN checkout fails with “chunk delimiter was invalid” - what can be done?

…衆ロ難τιáo~ 提交于 2019-12-21 12:55:58
问题 In the middle of the checkout ( http://aima-java.googlecode.com/svn/trunk/ ), the client stops with an error, the exact error message reads: org.tigris.subversion.javahl.ClientException: RA layer request failed svn:REPORT of '/svn/svn/vcc/default': Chunk delimiter was invalid I have googled the error but was unable to find a solution. The only thing I am now aware of is that the issue is somehow caused by incompatible svn versions. I use svn 1.6.12 from the regular ubuntu repo. The error is

Why maintain traditional detailed ChangeLog in modern world (with SVN, Mercurial, Git)?

夙愿已清 提交于 2019-12-21 12:27:24
问题 Detailed ChangeLog entry usually tell who, when and what function changed and for why this change done. And this for every separate function in the source code tree! As I understand ChangeLog come from past when there were no good VCS. So traditional ChangeLog doesn't need at all as you can get it all from: $ svn log . $ hg log . $ git log . $ bzr log . Only one possible needs for ChangeLog for short summary between product versions and intended for user only (for example, when new version

Version Control in Visual Studio

独自空忆成欢 提交于 2019-12-21 12:14:08
问题 I'm currently working on a large project, and am about to make some large changes, and was looking for a way to 'backup' my prior work. Is there built in functionality in Visual Studio to work with version control? This project is developed only by me, and doesn't use Team Foundation Server (which is what most of my googling seems to give me answers on). Ideally, I would like to identify and restore all the different versions of my program as it evolves, without having to worry about totally