dvcs | 易学教程

Git push won't do anything (everything up-to-date)

阅读更多关于 Git push won't do anything (everything up-to-date)

问题 I'm trying to update a Git repository on GitHub. I made a bunch of changes, added them, committed then attempted to do a git push . The response tells me that everything is up to date, but clearly it's not. git remote show origin responds with the repository I'd expect. Why is Git telling me the repository is up to date when there are local commits that aren't visible on the repository? [searchgraph] git status # On branch develop # Untracked files: # (use "git add <file>..." to include in

Transferring legacy code base from cvs to distributed repository (e.g. git or mercurial). Suggestions needed for initial repository design [closed]

阅读更多关于 Transferring legacy code base from cvs to distributed repository (e.g. git or mercurial). Suggestions needed for initial repository design [closed]

Introduction and Background We are in the process of changing source control system and we are currently evaluating git and mercurial. The total code base is around 6 million lines of code, so not massive and not really small either. Let me first start off with a very brief introduction to how the current repository design looks. We have one base folder for the complete code base, and beneath that level there are all sorts modules used in several different contexts. For example “dllproject1” and “dllproject2” can be looked at as completely separate projects. The software we are developing is

What's the best three-way merge tool? [closed]

阅读更多关于 What's the best three-way merge tool? [closed]

Subversion, Git, Mercurial and others support three-way merges (combining mine, theirs, and the "base" revision) and support graphical tools to resolve conflicts. What tool do you use? Windows, Mac OS X, Linux, free or commercial, you name it. Here's a few that I've used or heard of, just to get the conversation started: KDiff3 DiffMerge P4Merge Meld Beyond Compare Pro. (I recognize that this is sort of like the Best Diff Tool , but it's different in that I explicitly focus on three-way merge tools; WinMerge is off the list, for example.) sotto KDiff3 open source, cross platform Same interface

How does git track source code moved between files?

阅读更多关于 How does git track source code moved between files?

问题 Apparently, when you move a function from one source code file to another, the git revision log (for the new file) can show you where that code fragment was originally coming from (see for example the Viewing History section in this tutorial). How does this work? 回答1: It doesn't track them. That's the beauty of it. Git only records snapshots of the entire project tree: here's what all files looked like before the commit and here's how they look like after. How we got from here to there, Git

git push to multiple repositories simultaneously [duplicate]

阅读更多关于 git push to multiple repositories simultaneously [duplicate]

This question already has an answer here: pull/push from multiple remote locations 14 answers How can I make git push to push not only to origin but also another remote repository? as git push is only an alias for git push origin , can I alias git push to push to 2 remote repositories at once (with just that one command)? I’m not looking for a non-git script here but would like to set this up for my local repository in git. When I tried it with post-push scripts I failed. g19fanatic I don't think you can do it just by setting a flag on git, but you can modify a config file that will allow you

Git: merging public and private branches while while keeping certain files intact in both branches

阅读更多关于 Git: merging public and private branches while while keeping certain files intact in both branches

问题 I\'ve read a few git questions here, but could not find an answer to this one: I have a public and a private branches where I want to allow certain files to diverge. Those are configuration files with passwords and my local customizations. I do want to be able to merge the branches both ways: from private to public and back, but I do not want to ever have those specific files merged automatically. Is there a way to set up git this way? I\'d love to find an automated solution :) - so that

What makes merging in DVCS easy?

阅读更多关于 What makes merging in DVCS easy?

问题 I read at Joel on Software: With distributed version control, the distributed part is actually not the most interesting part. The interesting part is that these systems think in terms of changes, not in terms of versions. and at HgInit: When we have to merge, Subversion tries to look at both revisions—my modified code, and your modified code—and it tries to guess how to smash them together in one big unholy mess. It usually fails, producing pages and pages of “merge conflicts” that aren’t

Git under windows: MSYS or Cygwin?

阅读更多关于 Git under windows: MSYS or Cygwin?

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. Given that, what option would you suggest? VonC Edit (2 more years later: October 2014) Johannes Schindelin

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

阅读更多关于 How can I stop .gitignore from appearing in the list of untracked files?

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? August Lilleaas 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 .gitignore to the .gitignore file if you don't want it to be committed. However, in that case

Comparison between Centralized and Distributed Version Control Systems [closed]

阅读更多关于 Comparison between Centralized and Distributed Version Control Systems [closed]

问题 As it currently stands, this question is not a good fit for our Q&A format. We expect answers to be supported by facts, references, or expertise, but this question will likely solicit debate, arguments, polling, or extended discussion. If you feel that this question can be improved and possibly reopened, visit the help center for guidance. Closed 7 years ago . What are the benefits and drawbacks with using Centralized versus Distributed Version Control Systems (DVCS)? Have you run into any