Hi I have been pushing to this repo successfully for some time, it started giving me the following error from no where, any ideas why it is happening? Ishaqs-Mac:source ishaq$ git push Counting objects: 68, done. Delta compression using 2 threads. Compressing objects: 100% (50/50), done. Connection to SERVER closed by remote host. erro...
I have notice a trend for developers to comment their changes less with the justification that the purpose/date/reason is in the changelog. They have some very justifiable claims that duplication of effort is occuring if we require both. I am spending some serious amount of time tracking down changes. No specific direction has been giv...
How do I set up a Git project to contains other projects? eg. I am working on an online mapping app. We developed a GPS tool together with an outfit in SF. We simultaneously developed a Python Geomapping script together with a different concern (that only cares about geomapping). Our own core files unite the two, and build upon them ...
Does anyone know of a git repository browser that I can host on my own server similar to github? I really like the github browsing and histrory interface, but my favorite part is the network graph. I'd like to run something like this to see the branches and merges in my own repositories. ...
I have tried to test a few Open source codes. The problem is that these projects changes rapidly such that my code is daily old. For example, I started yesterday to test the code at. The code at my server is already old. The problem is that all changes which I have done are not included in the newest code when I upload their branch to m...
I wonder why isn't it implemented in the GUI? I know git has a content approach vs. single file approach but sometimes single file reverting is crucial. For instance an .png graphics file from a few commits before is needed. Probably I need to do a checkout but I'm still not sure as the concepts sometimes escape me. ...
SVN Time-Lapse View is a cross-platform viewer that downloads all revisions of a file and lets you scroll through them by dragging a slider. As you scroll, you are shown a visual diff of the current revision and the previous revision. Thus you can see how a file evolved, and you can easily find the revision at which lines appeared, disap...
Hi All, I've been using git for about a year now and think it's fantastic, but I've just started on a second version of the project and started a new branch for it. I'm struggling a little with the best way to handle things going forward. I have two branches called say master10 (for v1) and master20 (for v2). I've been making bug fixe...
Duplicate How do I make git-svn use a particular svn branch as the remote repository? I am using git-svn to track development by someone else on svn. I'm trying to figure out how to use gti-svn to switch from one svn branch to another. All the examples I have able to find talk about using svn switch as method to switch location ins...
My situation is, I can ssh to ComputerB (Code repos) where git repos is put. But my local connection is too slow to clone the code. And I can ssh to another machine (ComputerA) which is faster, so I want to clone the code through ComputerA. This is what I did: ssh tunnel ssh tunnel MyComputer ------...
Is there a way to "git svn dcommit" from a cloned git-svn repository : I have several branches in my svn, sometimes it is very small branch and it is nice to have it in the same directory, but sometimes these branches grow big and it is nice to move the whole thing to another folder. But when I do a git clone from this local repository...
Gitx has a great diff viewer, how do I make git automatically pipe git diff whatever into gitx? I've tried to set git config diff.external to a shell script that looks like this: git diff "$2" "$5" | gitx However, that only opens all the individual files up into multiple gitx windows, and it really messes up the files names (changes ...
Are there command line merge tools for windows? I'm thinking in terms of tools that can be used in conjunction with other tools (e.g. git, unison) to resolve conflicts. Actually, it doesn't need to strictly be command-line based, as long as it "cooperate" with other command line tools (as I mentioned, git for example), then it's fine. ...
$ git ls-tree fb3a8bdd0ce 100644 blob 63c918c667fa005ff12ad89437f2fdc80926e21c .gitignore 100644 blob 5529b198e8d14decbe4ad99db3f7fb632de0439d .mailmap 100644 blob 6ff87c4664981e4397625791c8ea3bbb5f2279a3 COPYING 040000 tree 2fb783e477100ce076f6bf57e4a6f026013dc745 Documentation 100755 blob 3c0032cec592a765692234f1cba47dfdcc3...
I don't want to add schema.rb to .gitignore, because I want to be able to load a new database schema from that file. However, keeping it checked in is causing all sorts of spurious conflicts that are easily resolved by a fresh db:migrate:reset. Basically I want a way to: Keep schema.rb in the repository for deploy-time database setup...
When I do a git push, I see the following: warning: updating the currently checked out branch; this may cause confusion, as the index and working tree do not reflect changes that are now in HEAD. I Googled for this message, and all I can find is a git mailing list discussion where the authors try to decide exactly how to make this mes...
Here's the scenario: I have a local git repository that mirrors the contents of another source control system (a proprietary one). I've written a script that periodically syncs my git branch with that system's latest copy of the same branch (called by another term in the other system but conceptually similar). Now, suppose that in the...
The theory that "disk" is cheap has gotten a bit out of hand lately. There are some powerful aspects of version control that have enabled us to onboard new developers with a few bootstrap files and one simple command to pull the toolchain over. Recently upgrades to the systems have prompted requests for storing built binaries. This ...
I'm working on a Open Source project on SourceForge that uses Subversion. A few days ago I did a git svn clone and started tracking my changes using Git. After a while I tried to dcommit my changes back upstream. But that failed with the following error: Autorisierung schlug fehl: MKACTIVITY von »/svnroot/housebot/!svn/act/b8dbd0ff-f22...
I use to work with Visual Studio + C#, and have been using svn before, but not currently, so I want to put my code again on source's control. Recently i heard about git, and I have been reading the git wiki and this and this, and i have read that there are no gui clients for git like TortoiseSvn, or at least, i haven't found'em. My que...