Eclipse Community Forums: EGit / JGit

Help

Home

Home » Eclipse Projects » EGit / JGit » Basic Help(Help please, trying to get my head around all this)

Show: Today's Messages :: Show Polls :: Message Navigator

Basic Help [message #523049]

Wed, 24 March 2010 21:24

Ben Alembick

Messages: 4
Registered: March 2010

Junior Member

Hi,

I am completely new to this (eclipse and GIT - actually just trying to switch from homesite Smile

so project etc are a new phenomenon to me.), in fact i am pretty new to source control in general i looked into using some (SVN) about 6 years ago but never actually got round to doing anything.

I have been recommended by a few people that if i am starting from scratch then it would be a good idea to try and get my head around GIT as opposed to using SVN. Plus my research seems to point towards GIT being the Future.

I have a general understanding of SVN in that a central repository is stored on a server somewhere, and everyone takes their code from there, but GIT is made up of lots of separate repositories 9not sure how they all link together)

The more i think about this the more i don't understand how its is all meant to work. I have EGIT installed and have kinda gotten the hang of committing, adding to version control & resource history on a local project stored on my machine.

However i have my live sites on a remote server hosted (at Alurium) how should i go about getting the sites onto my local machine and using GIT? then syncing?

Im at a complete loss

Cheers in advance

Ben

Report message to a moderator

Re: Basic Help [message #523058 is a reply to message #523049]

Wed, 24 March 2010 22:11

Lars Vogel - out of office until 16.03.2020

Messages: 1094
Registered: July 2009

Senior Member

Hi,

this tutorial gives two example how to get code from external sides:
http://www.vogella.de/articles/EGit/article.html

Hope it helps.

Cheers, Lars
On 24.03.2010 14:24, Ben Alembick wrote:
> Hi,
>
> I am completely new to this (eclipse and GIT - actually just trying to
> switch from homesite :) so project etc are a new phenomenon to me.), in
> fact i am pretty new to source control in general i looked into using
> some (SVN) about 6 years ago but never actually got round to doing
> anything.
>
> I have been recommended by a few people that if i am starting from
> scratch then it would be a good idea to try and get my head around GIT
> as opposed to using SVN. Plus my research seems to point towards GIT
> being the Future.
>
> I have a general understanding of SVN in that a central repository is
> stored on a server somewhere, and everyone takes their code from there,
> but GIT is made up of lots of separate repositories 9not sure how they
> all link together)
>
> The more i think about this the more i don't understand how its is all
> meant to work. I have EGIT installed and have kinda gotten the hang of
> committing, adding to version control & resource history on a local
> project stored on my machine.
>
> However i have my live sites on a remote server hosted (at Alurium) how
> should i go about getting the sites onto my local machine and using GIT?
> then syncing?
> Im at a complete loss
> Cheers in advance
>
> Ben

Report message to a moderator

Re: Basic Help [message #523080 is a reply to message #523049]

Thu, 25 March 2010 00:14

Ben Alembick

Messages: 4
Registered: March 2010

Junior Member

Hi,

Ive played around, and now finaly have a github repositry set up.

Ive just been playing with a test project and done the following to try and recreate two users editing code.

(note the use of CFBUILDER & CFECLIPSE as two different users)

Created a project locally in CFBUILDER
Pushed the project to github
then imported the project into CFECLIPSE
made a change in CFBUILDER ie "edited in cfbuilder"
committed this change
made a change in CFECLIPSE ie "edited in cfeclipse"
committed this change
Then pushed the test project back to github from CFBUILDER
Checked the github history and commit note
all as expected
Then pushed the test project back to github from CFECLIPSE
this time an message was displayed saying "rejected" with red background
if i click back and check "force update" i works

Now everything seems to be out of sync (ish)

Anyone got any ideas?

Should a difference screen appear to show that changes have been made by someone else?

Cheers

Ben

Report message to a moderator

Previous Topic:	Announce EGit/JGit 0.7.1
Next Topic:	Basic Help

Goto Forum:

-=] Back to Top [=-

[ Syndicate this forum (XML) ] [

]

Current Time: Wed Jul 08 06:11:11 GMT 2020

.:: Contact :: Home ::.

Breadcrumbs

Sign up to our Newsletter