I am using Git Version Control on an remote server and I have set up a repository that multiple people will be using to push/fetch from. I have put the repo under /srv/subdir/git/.git I have been experiencing problem after problem it seems like. a) Is this location suitable for handling a project that will need to be accessed/modified...
I am using Git Version Control witht he JGit Plugin for the eclipse IDE. when I changed the location of my repo, and when to push to the new repository. I am receiving the following error message. Cant connect to any repository: git+ssh/username@remoteIPAddressgoeshere/srv/wma/git Transport error occured during push operation: Java.IO...
Is there any way I can repair my repository with commit history in tact. # git log fatal: object 01aeb2bf2e93b238f0e0422816b3e55518321ae7 is corrupted From reading the link below it looks like I'll have zap it and start over. http://www.miek.nl/s/7e76eadefe/ ...
In ClearCase evil twin occurs when two files are found with the same name in two different versions of the directory, and If the element OIDs are different but the names are the same. In GIT the SHA1 id is always unique and file with same name always have different SHA1 id’s. We don’t have a concept of Evil twins, but there are likely ...
In clearcase If I am working on some file X and want to also see its previous version(say version 5) it is available as X@@/main/5. Is something similar available with other (preferably free) version control systems? HG has hg cat and hg co. but they still do not come close to clearcase's feature above... Regards Vijay ...
The Story After cleaning up my Dreamhost shared server's home folder from all the cruft accumulated over time, I decided to start afresh and compile/reinstall Python. All tutorials and snippets I found seemed overly simplistic, assuming (or ignoring) a bunch of dependencies needed by Python to compile all modules correctly. So, starting...
Oops! It seems I did something wrong the last time I merged two branches in my repository: This was far from what I was expecting. Is there a way to arrange this mess and obtain something like the following? What did I do wrong? ...
git checkout master git archive stage | tar -czf archive.tar.gz htdocs # archives master because it's checked out. How can I archives the stage branch, regardless of the current I'm on? ...
Is there a way to set up a git repository, so that git pull defaults to one remote and git push defaults to another? I know I can set both by changing the value of the remote variable in branch section of .git/config, but how to do it for each direction separately? ...
I'm honestly not clear on the semantics here. They're all about copies/variants of a code+history unit, but past that I'm not sure I could say. Is this logical structure explained somewhere? ...
I work with a small team that uses git for source cod management. Recently, we have been doing topic branches to keep track of features then merging them into master locally then pushing them to a central git repository on a remote server. This works great when no changes have been made in master: I create my topic branch, commit it, ...
What are the pro/con's of using: - hub - github-gem - or just git when working with github? ...
I'm trying to mash all my changes since I last pushed to the svn server into one big patch that I can email to my coworker for review. Can I do this with git format-patch ? ...
I'm developing a small pet project on Google App Engine and i would like to keep code under source control using github; this will allow a friend of mine to checkout and modify the sources. I just have a directory with all sources (call it PetProject) and Google App Engine development server points to that directory. Is it correct to ...
I have two repos that claim to be clean. One was originally cloned from the other and is used for dev work. There are a few files that I can see are not the same. However when I try pulling either way it says everything is up to date. How is this possible? Did that file miss a commit somehow? ...but shouldn't the difference be noticed...
I've committed a bunch of commits to a project on Github, however I realized I hadn't set up the proper email and committer full name on the computer I'm currently using to make my commits and therefore the users avatar and email address are not there. How can I rewrite all past commit email and usernames? ...
When the binary files, swfs, jars and flvs are changed locally, and I try to pull in changes, git tries to merge them and reports conflict. And then, I branch to a temporary branch, and commit the local changed binary files, and merge them back after the pull with recursive theirs strategy. -- Too much work. Is there a way to tell git,...
Ok I hope that this will end up sounding like a reasonable question. From what I understand of subversion if you have a repo that contains multiple projects, then you can branch individual projects within that repo (see SVN Red book - Using Branches) However what I don't quite follow is what happens when you create a branch in one o...
If I cherry-pick from multiple branches, is there a simple way to figure out where the commit was coming from (e.g. the sha of the original commit)? Example: - at master branch - cherry pick commit A from a dev branch - A becomes D at the master branch Before: * B (master) Feature Y | * C (dev) Feature Z | * A Feature X |/ * 3 * 2 *...
I'd like to be able to layer other branches on top of an existing branch, and have those branches be revisioned independently. This would be useful, for example, to allow the binaries for various subprojects to be unified into the same bin directory. In general a given file would only be present in one layer. Ideally I guess I would u...