Stack Overflow
Stack Overflow

Questions tagged [dvcs]

DVCS stands for Distributed Version Control System. Use this tag for questions about DVCSes in general. If your question is about git, or another DVCS that has its own tag already, then use that tag instead of this one.

Distributed revision control system (DRCS), distributed version control or decentralized version control system (DVCS) keeps track of software revisions and allows many developers to work on a given project without necessarily being connected to a common network.

Most popular DVCS:

911 questions
124
votes
10 answers

What do people think of the fossil DVCS?

fossil http://www.fossil-scm.org I found this recently and have started using it for my home projects. I want to hear what other people think of this VCS. What is missing in my mind, is IDE support. Hopefully it will come, but I use the command…
javelinBCD
  • 1,911
  • 3
  • 15
  • 22
119
votes
22 answers

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…
Jamie Wong
  • 18,104
  • 8
  • 63
  • 81
112
votes
7 answers

Found a swap file by the name

When I try to merge my branch with a remote branch: git merge feature/remote_branch I got this message: E325: ATTENTION Found a swap file by the name ".git/.MERGE_MSG.swp" owned by: xxxxxx dated: Mon Nov 12 23:17:40 2012 file…
Malloc
  • 15,434
  • 34
  • 105
  • 192
111
votes
5 answers

Why might git log not show history for a moved file, and what can I do about it?

I've renamed a couple of files using git mv, used git stash, had a quick look at HEAD (without changing it) then did git stash pop to get the whole lot back again. My moves had disappeared from the commit list, so I redid them with git rm and the…
please delete me
98
votes
2 answers

Consequences of using graft in Mercurial

There've been several questions recently about skipping changes when maintaining release branches in Mercurial. For example: Mercurial: Branch specific changes keep coming back after dummy merge Why are Mercurial backouts in one branch affecting…
Paul S
  • 7,645
  • 2
  • 24
  • 36
95
votes
7 answers

Delete all local changesets and revert to tree

I'm using Mercurial and I've got into a terrible mess locally, with three heads. I can't push, and I just want to delete all my local changes and commits and start again with totally clean code and a clean history. In other words, I want to end up…
Richard
  • 62,943
  • 126
  • 334
  • 542
91
votes
3 answers

git push to multiple repositories simultaneously

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…
Kissaki
  • 8,810
  • 5
  • 40
  • 42
91
votes
3 answers

How to abort a merge in mercurial?

I goofed up a merge. I'd like to revert then try again. Is there a way to revert a merge before it is committed? hg revert doesn't do what I'd like, it only reverts the text of the files. Mercurial aborts my second attempt at merging and complains…
deft_code
  • 57,255
  • 29
  • 141
  • 224
82
votes
5 answers

How do I git reset --hard HEAD on Mercurial?

I'm a Git user trying to use Mercurial. Here's what happened: I did a hg backout on a changeset I wanted to revert. That created a new head, so hg instructed me to merge (back to "default", I assume). After the merge, it told me I still had to…
agentofuser
  • 8,987
  • 11
  • 54
  • 85
80
votes
13 answers

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…
joce
  • 9,624
  • 19
  • 56
  • 74
79
votes
3 answers

Git create branch from current checked out master?

There is a git controlled folder on a server where the main branch is checked out and a whole pile of files have been modified and not committed. Is there a way for me to commit the changes to a separate branch so I can go back to a clean…
corydoras
  • 7,130
  • 12
  • 55
  • 58
79
votes
15 answers

Comparison between Centralized and Distributed Version Control Systems

What are the benefits and drawbacks with using Centralized versus Distributed Version Control Systems (DVCS)? Have you run into any problems in DVCS and how did you safeguard against these problems? Keep the discussion tool agnostic and flaming to…
Spoike
  • 119,724
  • 44
  • 140
  • 158
77
votes
5 answers

Backing Out a backwards merge on Mercurial

How do you reverse the effect of a merge on polarised branches without dying of agony? This problem has been plaguing me for months and I have finally given up. You have 1 Repository, with 2 Named Branches. A and B. Changes that occur to A will…
Kent Fredric
  • 56,416
  • 14
  • 107
  • 150
76
votes
34 answers

Getting started with Version Control System

I need to implement version control, even for just the developing I do at home. I have read about how great subversion is for the past couple of years and was about to dedicate myself to learning this on the side until I heard about Git being the…
Mark Norgren
  • 2,004
  • 6
  • 28
  • 30
76
votes
17 answers

Locking binary files using git version control system

For one and a half years, I have been keeping my eyes on the git community in hopes of making the switch away from SVN. One particular issue holding me back is the inability to lock binary files. Throughout the past year I have yet to see…
Mario
  • 2,229
  • 2
  • 21
  • 21
1
2
3
…
60 61