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 is great for me. Git SVN works out of the box, and is a no frills solution. … Read more
We now have a “stiging” branch, where “staging” seems to be a far better semantic fit. What’s a good strategy for handling this? 5 Answers 5
In Git I can do this: 1. Start working on new feature: $ git co -b newfeature-123 # (a local feature development branch) do a few commits (M, N, O) master A—B—C \ newfeature-123 M—N—O 2. Pull new changes from upstream master: $ git pull (master updated with ff-commits) master A—B—C—D—E—F \ newfeature-123 M—N—O 3. … Read more
I’m using Mercurial locally for a project (it’s the only repo there’s no pushing/pulling to/from anywhere else). To date it’s got a linear history. However, the current thing I’m working on I’ve now realized is a terrible approach and I want to go back to the version before I started it and implement it a … Read more
As it currently stands, this question is not a good fit for our Q&A format. We expect answers to be supported by facts, references, or expertise, but this question will likely solicit debate, arguments, polling, or extended discussion. If you feel that this question can be improved and possibly reopened, visit the help center for … Read more
For a while now I’ve been using subversion for my personal projects. More and more I keep hearing great things about Git and Mercurial, and DVCS in general. I’d like to give the whole DVCS thing a whirl, but I’m not too familiar with either option. What are some of the differences between Mercurial and … Read more
Locked. This question and its answers are locked because the question is off-topic but has historical significance. It is not currently accepting new answers or interactions. I’ve been using git for some time now on Windows (with msysGit) and I like the idea of distributed source control. Just recently I’ve been looking at Mercurial (hg) … Read more
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\lunch_call>git push Password: error: The requested URL returned error: 403 while accessing https://MichaelDrog [email protected]/derekerdmann/lunch_call.git/info/refs fatal: HTTP request failed Also set it up … Read more
I just did a git init on the root of my new project. Then I created a .gitignore file. Now, when I type git status, .gitignore file appears in the list of untracked files. Why is that? 19 s 19 The .gitignore file should be in your repository, so it should indeed be added and … Read more
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 only want to undo the working copy changes of just that one file alone, … Read more
