dvcs

What is the Difference Between Mercurial and Git?

◇◆丶佛笑我妖孽 提交于 2019-11-26 03:34:43
问题 Locked . This question and its answers are locked because the question is off-topic but has historical significance. It is not currently accepting new answers or interactions. I\'ve been using git for some time now on Windows (with msysGit) and I like the idea of distributed source control. Just recently I\'ve been looking at Mercurial (hg) and it looks interesting. However, I can\'t wrap my head around the differences between hg and git. Has anyone made a side-by-side comparison between git

How do I show the changes which have been staged?

帅比萌擦擦* 提交于 2019-11-26 03:31:05
问题 I staged a few changes to be committed; how can I see the diff of all files which are staged for the next commit? I\'m aware of git status, but I\'d like to see the actual diffs - not just the names of files which are staged. I saw that the git-diff(1) man page says git diff [--options] [--] […] This form is to view the changes you made relative to the index (staging area for the next commit). In other words, the differences are what you could tell git to further add to the index but you

Pushing to Git returning Error Code 403 fatal: HTTP request failed

家住魔仙堡 提交于 2019-11-26 03:14:07
问题 I was able to clone a copy of this repo over HTTPS authenticated. I\'ve made some commits and want to push back out to the GitHub server. Using Cygwin on Windows 7 x64. C:\\cygwin\\home\\XPherior\\Code\\lunch_call>git push Password: error: The requested URL returned error: 403 while accessing https://MichaelDrog alis@github.com/derekerdmann/lunch_call.git/info/refs fatal: HTTP request failed Also set it up with verbose mode. I\'m still pretty baffled. C:\\cygwin\\home\\XPherior\\Code\\lunch

Git under windows: MSYS or Cygwin?

三世轮回 提交于 2019-11-26 02:51:12
问题 I plan to migrate my projects over to git, and I\'m currently wondering which is the best and / or most stable option under windows. From what I gather I basically have 2.5 options: MSYSgit git under Cygwin (aka 2.5) MSYSgit from a Cygwin prompt (given that Cygwin git is already installed). Note: IMO Cygwin in itself is a big plus as you can have access to pretty much all the *nix command line tools, as where with MSYSgit bash, you only have access to a rather small subset of these tools.

How can I stop .gitignore from appearing in the list of untracked files?

雨燕双飞 提交于 2019-11-26 02:26:01
问题 I just did a git init on the root of my new project. Then I created a .gitignore file. Now, when I type git status , .gitignore file appears in the list of untracked files. Why is that? 回答1: The .gitignore file should be in your repository, so it should indeed be added and committed in, as git status suggests. It has to be a part of the repository tree, so that changes to it can be merged and so on. So, add it to your repository, it should not be gitignored. If you really want you can add

Merging: Hg/Git vs. SVN

旧巷老猫 提交于 2019-11-26 01:48:35
问题 I often read that Hg (and Git and...) are better at merging than SVN but I have never seen practical examples of where Hg/Git can merge something where SVN fails (or where SVN needs manual intervention). Could you post a few step-by-step lists of branch/modify/commit/...-operations that show where SVN would fail while Hg/Git happily moves on? Practical, not highly exceptional cases please... Some background: we have a few dozen developers working on projects using SVN, with each project (or

Distributed Version Control Systems and the Enterprise - a Good mix? [closed]

点点圈 提交于 2019-11-26 00:16:44
问题 I can see why distributed source control systems (DVCS - like Mercurial) make sense for open source projects. But do they make sense for an enterprise? (over a centralized Source Control System such as TFS) What features of a DVCS make it better or worse suited for an enterprise with many developers? (over a centralized system) 回答1: I have just introduced a DVCS (Git in this case) in a large banking company, where Perforce, SVN or ClearCase were the centralized VCS of choices: I already knew

Merging: Hg/Git vs. SVN

删除回忆录丶 提交于 2019-11-25 23:39:34
I often read that Hg (and Git and...) are better at merging than SVN but I have never seen practical examples of where Hg/Git can merge something where SVN fails (or where SVN needs manual intervention). Could you post a few step-by-step lists of branch/modify/commit/...-operations that show where SVN would fail while Hg/Git happily moves on? Practical, not highly exceptional cases please... Some background: we have a few dozen developers working on projects using SVN, with each project (or group of similar projects) in its own repository. We know how to apply release- and feature-branches so

Sell me distributed revision control

混江龙づ霸主 提交于 2019-11-25 23:00:44
问题 I know 1000s of similar topics floating around. I read at lest 5 threads here in SO But why am I still not convinced about DVCS? I have only following questions (note that I am selfishly worried only about Java projects) What is the advantage or value of committing locally? What? really? All modern IDEs allows you to keep track of your changes? and if required you can restore a particular change. Also, they have a feature to label your changes/versions at IDE level!? what if I crash my hard

Describe your workflow of using version control (VCS or DVCS) [closed]

牧云@^-^@ 提交于 2019-11-25 22:39:47
问题 Closed . This question needs to be more focused. It is not currently accepting answers. Want to improve this question? Update the question so it focuses on one problem only by editing this post. Closed 6 years ago . I\'d like to learn other people workflow when using either vcs or dvcs. Please describe your strategy to handle the following tasks: Implement a feature Fixing bugs (during development and deployed app) Code Review Refactoring code (post code-review) Incorporate patches Releasing