I am new to Git and Aptana. I have downloaded Git from the location:windows.github.com. It installed fine.
I see a default integration of Aptana with Git, but what I dont know where it is pointing to which server location?
I want to host my code on GitHub so that I can keep different machine in Synch.
Thanks
There is a difference between Git and Github's application. Once you install both Git and Github's Windows application you need to setup both Git and Github in your PC — detailed help available in their respective sites.
Both Github's app and Aptana use the settings from your Git profile in your PC while committing and these details are simply, your username and email (and other profile settings if any).
If you want to use Aptana to connect to Github, you can do so by using: Wrench icon in the project sidebar > More > Add remote Here you must add a remote repository which will be used by Aptana. More details on Git remotes here. To avoid unnecessary hassles, the Windows Github app makes this management easier. Aptana provides a GUI around Git which is exactly what the Github App does, with some additional features and ease.
Hope I haven't confused you a little more.
Related
What is difference between Github Project and Git from Source Code Management in Jenkins?
Github is dedicated to using github services and it unlocks specific github features.
The other will work with any git SCM server including external vendors (github, bitbucket, your own infrastructure , team foundations server etc) . This means it will support only git standard features, nothing that is vendor specific.
You can configure both without problem.
If you install bitbucket plugin, you will have a similar third section.
I'm working in a rails project which uses SVN as central repository, but i'm working (locally) with git-svn, and I want to add a remote where i will only push master for testing purposes (i will push to Heroku).
I've read this from chapter 9.1 of Pro Git (my emphasis):
Don’t rewrite your history and try to push again, and don’t push to a
parallel Git repository to collaborate with fellow Git developers at
the same time. Subversion can have only a single linear history, and
confusing it is very easy. If you’re working with a team, and some are
using SVN and others are using Git, make sure everyone is using the
SVN server to collaborate — doing so will make your life easier.
I won't be collaborating with other Git developers (everyone else is using SVN), but before setting it up, i just want to be sure if there are any associated risks in doing this, and if so, what should/could i do about it.
If it's only for pushing to a repo so that you can then checkout/build/deploy, it won't hurt. That warning you noted is stated there so that you don't start moving around doing crazy things on the repo where you work with git-svn to relate to other developers also using git-svn (plus other restrictions) because of the way that revisions are kept on git-svn.
I am new in ruby on rails. i want to save my demo projects on github can any one help me to setup git in RubyMine IDE. Step by Step Help will be appreciated. I tried every link but didnt help out.
I tried following link.
http://www.jetbrains.com/ruby/webhelp/using-git-integration.html
I'll give it a shot and try to break down that tutorial into steps.
First, make sure you have git installed on your machine, if not there is a great tutorial to install git on windows by Github.
This is just one way to do it, but in a general overview
First create a local git repository with RubyMine
Next, add untracked files to the git repository with RubyMine
After then, commit changes to the git repository with RubyMine
Then, you create a repository on Github and push to your remote repository on Github with RubyMine
You can also do all of these things from the Git Bash command line or Github for Windows GUI as well.
Hopefully this helps.
I have this confusion and perhaps it may be basic question. I am planning to work on a Rails project along with a friend who stays in a different location.
We have identified Heroku as our deployment platform and Bitbucket for SCM related activities.
Both me and my friend are new to rails but we are familiar with web development in general.
I m working on a Windows box while he is on a Mac. We both have the same rails version including the gems. However, I'm not sure really sure how do we manage the source code and code integration. The reason I say this is because, when we try to commit the entire code from our systems a few platform specific rails file gets uploaded on the server, thereby rendering the deployment useless.
So my question is if I am on Windows and my friend is on Mac, whats the recommended way of working together on a single RAILS project and deploy it on a common platform to get the same desired functionality.
Yes, by using the source control management (SCM) you selected when you set up your repository.
For instance, if you use git, you would copy your repository using git clone (the command is provided via the bitbucket interface by clicking on clone), make your changes, and then git push your changes back into the repository.
When you want to code next, execute a git pull command to get the latest repo changes and then work and git push your changes back to the repo.
For examples see Bitbuckets fantastic tutorial.
As a side note, bitbucket also supports mercurial, although I haven't used it.
As far as your actual issue, each person will need to make sure the platform dependent files are excluded from your repository. If you're using git, see the git book specifically the section on .gitignore and git rm
I am developing some school grading software and decided to use Github to host the project. After building some code on my Ubuntu box I pushed it to Github and then cloned it down to my MacBook Pro. After editing the code on the MBP I pushed it back to Github. The next morning I tried to update my repo on the Ubuntu box with a git pull and it gave me all kinds of trouble.
Whats the best way to work in this situation? I don't want to fork my own repo and I don't really want to send myself emails or pull requests. Why can't I just treat Github like a master and push/pull from it onto all of my personal repos on different computers?
I'll assume your problem was that the machine on which you first created the repo crapped out when you tried to issue the git pull command.
When you clone an existing git repository (like you did on your 2nd machine, the MacBook Pro), you're automatically set up to so your git pull commands will automatically merge the remote with your local changes.
However, when you initially create a repo and then share it on a remote repository, you have to issue a few commands to make things as automated as a on cloned repo.
# GitHub gives you that instruction, you've already done that
# git remote add origin git#github.com:user_name/repo_name.git
# GitHub doesn't specify the following instructions
git config branch.master.remote origin
git config branch.master.merge refs/heads/master
These last few instructions configure git so future git pull's from this repo will merge all remote changes automatically.
The following is a bit of shameless self-promotion. If you use Ruby, I have created a Ruby-based tool that lets you deal with all these kinds of things with git remote branches. The tool is called, unsurprisingly, git_remote_branch :-)
If you don't use Ruby, my tool is probably gonna be too much of a hassle to install. What you can do is look at an old post on my blog, where most of the stuff grb can do for you was explicitly shown. Whip out your git notes file :-)
You can also add multiple SSH public keys.