I’ve read through countless tutorials and I keep coming up short. Here’s what I’ve got: I’m running RubyMine on my Windows desktop I’ve installed Git on my WebFaction hosting account per their instructions Git appears to be working fine on both machines Here’s what I’m doing: On server: mkdir project git init git add . … Read more
This question already has answers here: How to modify a specified commit? (17 answers) Closed 7 years ago. I have made 3 git commits, but have not been pushed. How can I amend the older one (ddc6859af44) and (47175e84c) which is not the most recent one? $git log commit f4074f289b8a49250b15a4f25ca4b46017454781 Date: Tue Jan 10 10:57:27 … Read more
Coming from svn, just starting to become familiar with git. When a branch is deleted in git, is it removed from the history? In svn, you can easily recover a branch by reverting the delete operation (reverse merge). Like all deletes in svn, the branch is never really deleted, it’s just removed from the current … Read more
I’m working on a team with a few developers using git on BitBucket. We are all working on a dev branch, not pushing to master until a release. One of the developers committed incorrect code that overwrote my own by accident, and now I am trying to push the correct code back to the repo. … Read more
In the Pro Git book, it says “origin” is not special Just like the branch name “master” does not have any special meaning in Git, neither does “origin”. While “master” is the default name for a starting branch when you run git init which is the only reason it’s widely used, “origin” is the default … Read more
Closed. This question is opinion-based. It is not currently accepting answers. Want to improve this question? Update the question so it can be answered with facts and citations by editing this post. Closed 6 years ago. Improve this question How often should I commit changes to source control ? After every small feature, or only … Read more
I’d like to rebase to a specific commit, not to a HEAD of the other branch: A — B — C master \ \– D topic to A — B — C master \ \– D topic instead of A — B — C master \ \– D topic How can I achieve that? 11 … Read more
Wikipedia says a 3-way merge is less error-prone than a 2-way merge, and often times doesn’t need user intervention. Why is this the case? An example where a 3-way merge succeeds and a 2-way merge fails would be helpful. 4 Answers 4
Can someone explain a “tracking branch” as it applies to git? Here’s the definition from git-scm.com: A ‘tracking branch’ in Git is a local branch that is connected to a remote branch. When you push and pull on that branch, it automatically pushes and pulls to the remote branch that it is connected with. Use … Read more
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 … Read more
