I'd like to include a file in my .gitconfig that has my github settings - is this possible?
Can I do something like this:
[core]
include = /path/to/file
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
I just tried to rebase a very old branch with a minor modification onto my master.
There was a problem with merging just one of the three files involved, so I did an unthinking --skip, thinking that it would just skip that file, but as it happened, it seems to have skipped all my changes, and rolled forwards. So now the rebase is finished, and my changes seem to have disappeared.
I've seen the question about undoing rebase, but it's all greek to me, I see the reflog, but I don't know which commit the branch was attached to before the rebase.
In any case, I don't really need to undo the rebase, I just want to be able to recover the changes in the two files. Is there anyway to do this properly (failing this, I'll just have to restore yesterday's backup of my repository and pick the bits out by hand).
I'm using S3 in this application for uploaded files, as Heroku has a read-only filesystem. How can I give my s3.yml to Heroku, but avoid checking it into the main repository?
So, after little thinking I have wrote the following:
# In repository we don't need to have:
# Compiled object files
*.o
# Generated MOC, resource and UI files
moc_*.cpp
qrc_*.cpp
ui_*.h
# Built windows .exe and linux binaries
# NOTE: PROJECT is a your project's name, analog of PROJECT.exe in Linux
*.exe
*.dll
PROJECT
# Windows-specific files
Thumbs.db
desktop.ini
# Editors temporary files
*~
# Debug and Release directories (created under Windows, not Linux)
Debug/
Release/
Please ask, what needs to be added or fixed (especially for Windows - I haven't one under hand now. And Mac too [haven't work in it at all]).
I want to keep my repository clear :-)
i've been experimenting with github as my personal code rep.. and it has been a bit of a disaster with windows.
i've used Subversion, CVS, and Perforce in the past.. none were as annoying to use as github.
i've figured out the PGP part, although my workstation no longer lets me check in, and after searching around it turns out that github bash is using putty which is not that reliable and should be configured with something else..
i was not able to configure it with windows shell extension for a nice visual of what is part of the repository, what is modified, and easy check ins, and easy pushes..
has anyone successfully configured some kind of windows shell client and can efficiently and quickly synchronize various machines?
It just seems to be more pain to use than it is worth..
I've got two branches from my master: v2.1 (version 2) I've been working on for several months; wss that I created yesterday to add one specific feature to my master (in production)
Is there a way to copy yesterday's commits from wss to v2.1?
I am trying to get Composer do download the latest commit for the Behat/MinkSelenium2Driver package. That particular repo only has a master branch. I have tried every method I can think of, including deleting the files and letting it pull them back in, to get it to work but it doesn't.
How would I get it to pull in latest committed files or at least those from the commit I list below?
Specifically I want to get this commit:
https://github.com/Behat/MinkSelenium2Driver/commit/2e73d8134ec8526b6e742f05c146fec2d5e1b8d6
Thanks,
Patrick
We use SVN for our source-code revision control and are experimenting using it for non-source-code files.
We are working with a large set (300-500k) of short (1-4kB) text files that will be updated on a regular basis and need to version control it. We tried using SVN in flat-file mode and it is struggling to handle the first commit (500k files checked in) taking about 36 hours.
On a daily basis, we need the system to be able to handle 10k modified files per commit transaction in a short time (<5 min).
My questions:
Is SVN the right solution for my purpose. The initial speed seems too slow for practical use.
If Yes, is there a particular svn server implementation that is fast? (We are currently using the gnu/linux default svn server and command line client.)
If No, what are the best f/oss/commercial alternatives
Thanks
Hi,
I am very new to ruby on rails. I've installed a complicated ruby on rails project via github clone and bundle install, and I was making minor changes to it until it reaches a point whereby it is not stable anymore, sass was throwing strange exceptions, so did other ruby gems. For a rails project, is there a way to clean up the project (aka, remove any "compiled or cached code") and just run again.
My alternative now is to go thru github clone and bundle install again, but that means all of my modified changes have to be reapplied again. What is rails equivalent of "make clean" in Java? Is "rake clean" the answer? Do we need to run any bundle commands?
Gitorious has been around longer and the two sites seem to cover the same ground, yet a quick Google Fight shows Github almost two orders of magnitude higher.
Is there a larger distinction that I'm not aware of?
Two of version controls uses seem to dictate different checkin styles.
distibution centric: changesets will generally reflect a complete feature. In general these checkins will be larger. This style is more user/maintainer friendly.
rollback centric: changesets will be individual small steps so the history can function like an incredibly powerful undo. In general these checkins will be smaller. This style is more developer friendly.
I like to use my version control as really powerful undo while while I banging away at some stubborn code/bug. In this way I'm not afraid to make drastic changes just to try out a possible solution. However, this seems to give me a fragmented file history with lots of "well that didn't work" checkins.
If instead I try to have my changeset reflect complete features I loose the use of my version control software for experimentation. However, it is much easier for user/maintainers to figure out how the code is evolving. Which has great advantages for code reviews, managing multiple branches, etc.
So what's a developer to do? checkin small steps or complete features?
I am working on a small project with gist and since it is growing I would like to put it on github.
Let's suppose that:
my gist repo is at: https://gist.github.com/1234
my new (empty) repo is at: https://github.com/ChrisJamesC/myNewProject
The ideal solution would be one that pushes my changes on both the gist and the github repository. However, if it is not possible I will prefer the solution where everything is on github and I delete the gist.
I have a large cross-cutting commit that I would like to split up according to the authors whose code was affected, both to increase the reviewers' familiarity with the code they're reviewing, and to divide the review burden equitably.
I realize that the blame may be mixed within a given hunk, in which case it would be nice to either collect multiple reviewers or just choose the most "blameworthy" one (breaking ties arbitrarily is fine).
I have the following situation:
A software hosted at github.
4 developers, each have her own fork in github.
Each developer creates and develops using branches in her own fork.
Given that we use branches to develop, we want to merge our branches (in our forks) to the upstream repo. How do I merge in github without using pull request? Is it possible to merge to upstream from my own fork?
Thanks in advance.
I am responsible for a small development team and we deal mainly with database development. We are currently using MS Visual Source Safe as our source control system, but it has its limitations and we are seriously thinking about changing. What system would you choose?
I'm doing a pull origin some_branch and can see there are a lot of changes. Eventually I don't mind if their erase all mine.
How can I accept them all instead or using mergetool and merge files one by one?
Not real information:
$ ssh-keygen -t rsa -C "[email protected]"
Generating public/private rsa key pair.
Enter file in which to save the key (/c/Users/Tekkub/.ssh/id_rsa):
ssh.txt
I entered a file name here. Not sure if i should have,
Enter passphrase (empty for no passphrase):
I am stuck here. I type and it doesnt work