dvcs Questions

8

Solved

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 dat...
Dionisio asked 13/11, 2012 at 13:39

6

I tried to use the "shelf" feature for the first time in IntelliJ IDEA today. I shelved all my current changes so that I could work on a quick bugfix, commit it, and come back to my current work af...
Artimas asked 19/3, 2015 at 8:56

9

Our company has a large codebase in VB6, and we currently use VSS which, for all that we hate about it, at least integrates into the VB6 IDE. My own team, which is using .NET, are now looking into...
Meanwhile asked 17/3, 2010 at 13:21

3

Solved

I was wondering if it is possible to have more than one URL for each git submodule. It would be interested to have more than one source of it if one of them is down or someone is behind a proxy tha...
Aksum asked 6/1, 2010 at 19:5

7

Solved

I am working with a bitbucket git repo I have read-only access to, so I created a fork to work on my features. Question: How do I update my fork to include changes made to the original repo made ...
Overmantel asked 30/3, 2012 at 14:26

75

Solved

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...
Yalta asked 15/9, 2011 at 22:45

2

Solved

I have a source control system using SourceGear Vault. I'm playing with Git and wanted to see if I could get my SourceGear repo into Git. I cannot see any way to do this. Can anyone recommend a ...
Abigailabigale asked 23/5, 2012 at 13:6

5

Solved

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...
Scrotum asked 8/12, 2010 at 23:50

7

Solved

My server already runs IIS on TCP ports 80 and 443. I want to make a centralized "push/pull" Git repository available to all my team members over the Internet. So I should use HTTP or HTTPS. But ...
Quackenbush asked 9/9, 2008 at 11:11

15

Solved

After the last commit, I modified a bunch of files in my working copy, but I want to undo the changes to one of those files, as in reset it to the same state as the most recent commit. However, I ...
Cheung asked 28/3, 2009 at 5:9

22

Solved

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 i...
Secundine asked 29/5, 2010 at 21:27

5

Solved

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 assu...
Ulm asked 20/4, 2010 at 4:3

5

Solved

When I have two branches in Hg repo, how to merge only one file with another branch, without having all other files from changeset merged? Is it possible to merge only certain files, instead of wh...
Scandic asked 3/7, 2009 at 11:9

16

Solved

I staged a few changes to be committed. How do I see the diffs of all files which are staged for the next commit? Is there a handy one-liner for this? git status only shows names of files which are...
Faucal asked 19/10, 2009 at 9:57

3

Solved

One of the side-effects of using an external Subversion repository was getting automatic offsite backups on every commit. I'd like to achieve the same using Git. i.e. every commit to my local re...
Scudder asked 27/8, 2010 at 9:56

8

Solved

Is it possible to clone part of a Mercurial repository? Let's say the repository is quite large, or contains multiple projects, or multiple branches. Can I clone only part of the repository? E.g. ...
Defy asked 16/11, 2009 at 21:34

3

Solved

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. Mercuria...
Krell asked 20/10, 2010 at 18:24

11

Solved

I use GIT on a Mac. Enough said. I have the tools, I have the experience. And I want to continue to use it. No wars here... The problem is always with interoperability. Most people use SVN, which ...
Instil asked 19/5, 2009 at 15:26

3

Solved

I have a repository called Generic, which is a generic application. I have forked it into a repository called Acme, which just builds upon the application stored Generic repository and adds Acme Co...
Muse asked 18/7, 2014 at 1:17

4

Solved

In this project I am working, we do deployments based on tags. Whilst it's obligatory that the tags are done against the master branch (after you merge the release there), sometimes by mistake some...
Spoke asked 5/4, 2018 at 5:56

5

Solved

Is there any good way to handle large assets (i.e. 1000's of images, flash movies etc.) with a DVCS tool such as hg and git. As I see it, to clone repositories that are filled with 4 GB assets seem...
Interact asked 16/8, 2009 at 16:20

3

Solved

I like creating named branches in Mercurial to deal with features that might take a while to code, so when I push I do a hg push -r default to ensure I'm only pushing changes to the default branch....
Faubion asked 5/5, 2010 at 23:26

12

Solved

During merges mercurial leaves .orig file for any unresolved file. But after manually resolving problems and marking a file correct it does not delete the .orig file. Can it be automatically remove...
Abney asked 1/7, 2009 at 7:10

6

Solved

I have two repository urls, and I want to synchronise them such that they both contain the same thing. In Mercurial, what I'm trying to do would be: hg pull {repo1} hg pull {repo2} hg push -f {rep...
Petitioner asked 24/2, 2013 at 20:33

3

Solved

What I want to do: On my (ssh remotely accessible) university machine I work on a project which I have put under git source control (git init, then git commit -a after every change, all works fine)...
Mars asked 24/1, 2010 at 13:8

© 2022 - 2025 — McMap. All rights reserved.