|
|
Re: Basic Help [message #523080 is a reply to message #523049] |
Wed, 24 March 2010 20:14  |
Eclipse User |
|
|
|
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
|
|
|
Powered by
FUDForum. Page generated in 0.20123 seconds