Considering switching to Mercurial? We are too. I'm currently studying the benefits of DVCS which turn out to be vast, lust and must. I would love to hear from the community typical usage patterns. Let's create a "Top (te)N" productivity feature list for DVCS (based on Mercurial, or alike). Please describe work flows that prove to be...
As in tittle, i cant push my first repo to github... tried everything, but all i get is just same errors alternately again and again firstly i got: Permission denied (publickey). fatal: The remote end hung up unexpectedly i fixed it somehow than i got: error: src refspec master does not match any. fatal: The remote end hung up unexpe...
Hi, i created a folder common with a bunch of source files and folders But i want now to move the common folder into the include folder so it looks like include/common i tried doing 1) git add include 2) git mv common/ include/ but it fails with this error fatal: bad source, source=myrepo/common, destination=myrepo/include 3) i...
Today I started to play around with git to create some patches. I choose egit for this job, because I don't know a nice gui for git and I'm a eclipse user. I created a branch and I changed the following files (result of git status) modified: .gitignore modified: framework/src/play/utils/Java.java modified: modules/crud/ap...
Hi, i've modified several files in a folder and subfolders. I could add the top folder recursively but then i have several subfolders that are untracked, so every time i do the recursive add to stage changes, i have to untrack the subfolders with git rm -r --cached. Is there a better way to just stage the modifications that show up in g...
I've been using git for a while, and I understand why merge conflicts happen and that I need to make the final decision between two conflicting blocks of code. However, I want to find a way to fix merge conflicts without git modifying the conflicting files. For example, if there are merge conflicts in a Django template or HTML file whe...
With the increasing use of Git or SSH copying or login, we can use just 1 pair of public and private key, or we probably can create different pairs on different machines, such as 1 for the notebook and 1 for the desktop, and 1 for the Virtual Machine. Should we use 1 pair or should we use multiple pairs? If we use just 1 pair, then we ...
I have forked some one repository in github, but can i get the updates from the origin repository later? ...
Hi , I am working in ROR in a Ubuntu machine. I had done some changes in my files and commited it with a msg. Now when i checked with the git log thing.. I am getting a new msg rite above my commited message as Merge Branch 'myname' .. Why is it so coming like this ? Please give suggestions.. EDIT : Date: Mon Oct 11 11:42:29 2...
I ran this: $ git mv README README.md Then: $ git commit -m "renamed" README.md $ git push origin master But over at github, the old README file still exists in the repository. Why ? ...
Hello, I try to install this plugin on my Visual Studio 2010 Express : http://gitscc.codeplex.com/ But I can't find it in the plugin repository, the "Source Control" category of plugins is empty, is that normal ? Does the Express edition prevent utilization of Source Controls plugins ? Thank you ...
I upload PHP website project to server godaddy. And I use Netbeans and once I code on project at localhost, it'll execute remote synchronization with project on server when I save file. Now I want use Git, I read many guide, almost use GitHub. But I don't want to use GitHub. And here : http://progit.org/book/ch2-9.html To be able ...
Hi, I'm working on some feature with my co-worker. We created topic-branch. And everything is ok when we only merge everything - our branch on server with local copies and master to keep our branch up to date. But it is not ideal workflow. Could anyone point me a better solution? ...
Hey there, I'm a first time stackoverflow poster, long time reader. I'm dipping the toes into Rails and I'm trying to get git working. I've installed git using the OSX git installer, and can see the manual with $man git. But I can't for the life of me get any other commands to work. I've restarted the terminal as well. I'm on 10.5 if t...
I am using a bare git repository on a server for backup, and push local changes there with 'git push' after doing 'git commit' locally. 'git status' tells me # On branch master # Your branch is ahead of 'origin/master' by X commits. If I modify a file, and then do another commit followed by a push, git tells me that my branch is ahe...
I've got a Rails app with blog entries that I want to update from a separate Blog.git repo. I envision my workflow as something like: Write new blog entry Push to remote Git repo Call cap deploy:update, which will invoke a Rake task to update the database with any changed or new entries The hitch here is finding which files have cha...
We have a large project that encompass several sub-projects with their separate GIT repositories, which we are all looking to bring into Trac to help better manage the project as a whole. My question; Is it possible to reference their respective (separate) repositories from within Trac's component system? I've done some research into ...
I'm not sure if this should go here, or on superuser (as it seems to pertain to both topics), so I've put it here, if it's not appropriate, all go ask it on superuser. Anyway, I have a git repository that can't go completely open source (otherwise I would just put it on github and be done with it), and I have a server that I have ssh ac...
I'm trying to (permanently) migrate my group's Subversion repository to Git, but I'm running onto problems trying to clean up its non-standard directory structure. Some of the project's content is contained in trunk and branches folders, but not all of it. The project on Subversion is laid out like this: project/trunk/ project/branches...
hi all, After a pull, git status tells me that I have changed a 16Mb xml file. I have not touched this file; but its possible that EOL issues cause git's confusion (though I think not as I have autocrlf = input ). Yet I write because I cannot get rid of this thing. I have tried each of the following : git reset --hard HEAD git che...