Hi Michael, If you want to make any changes to the OAE code base, I would recommend doing that in a branch. When you pull the latest updates, it will not overwrite your changes. Git will attempt to merge the updates into the changes you’ve made. However, it is always possible that some of our updates will conflict with changes you have made locally, in which case Git will flag it as a merge conflict and you’ll have to manually resolve the conflict.
I would recommend reading up on how to use Git [1] and learn how to pull updates, create branches, commit code, etc. [1] http://git-scm.com/docs/gittutorial Kind regards, Nicolaas On 6 Mar 2014, at 03:23, Michael Anthony S. Balmes, MCP <mikebal...@jupinno.com> wrote: > Hi, > I’m just new about this repository stuff. There are some changes I make > from the codes that I downloaded from your site before. If ever I pull this > latest updates, will it overwrite all of my changes?is there a way not to > overwrite it? thanks > > MICHAEL ANTHONY S. BALMES > SOFTWARE ENGINEER > <image001.gif> > 10 Toh Guan Road #02-01 > T.T. International Building > Singapore 608838 > Email Address: mikebal...@jupinno.com > > > > From: Nicolaas Matthijs [mailto:nicolaasmatth...@googlemail.com] On Behalf Of > Nicolaas Matthijs > Sent: Wednesday, March 05, 2014 6:08 PM > To: Michael Anthony S. Balmes, MCP > Cc: oae-dev > Subject: Re: [oae-dev] Sakai Oae Configuration > > Just to be clear, you’ll have to pull the latest code and re-run `npm install > -d` to pick up the change. > > Hope that helps, > Nicolaas > > > On 5 Mar 2014, at 10:06, Simon Gaeremynck <gaeremyn...@gmail.com> wrote: > > > Hi Michael, > > I’ve pushed a commit that fixes the express version to 3.4.8. > Can you give it another try? > > Regards, > > Simon > > On 5 Mar 2014, at 09:37, Nicolaas Matthijs > <nicolaas.matth...@caret.cam.ac.uk> wrote: > > > Including the oae-dev list in this conversation. > > It looks like there’s been a change in one of the underlying dependencies > (connect) overnight. I’ve created a GitHub ticket at [1] that will be used to > track the work needed to fix the incompatibility. We should have a fix in > place later today. > > [1] https://github.com/oaeproject/Hilary/issues/816 > > Hope that helps, > Nicolaas > > > Begin forwarded message: > > > From: "Michael Anthony S. Balmes, MCP" <mikebal...@jupinno.com> > Subject: Sakai Oae Configuration > Date: 5 March 2014 08:06:04 GMT > To: "'Nicolaas Matthijs'" <nicolaas.matth...@caret.cam.ac.uk> > > Hi sir, > May I know the problem in my configuration, I followed the instruction > you have given to me based on this > link,https://github.com/oaeproject/Hilary#windows-dependencies as I start and > run the server, an error was occurred. You can see it based on the picture > that I attach to this email (sakaioae in putty.jpg) and when I check the > browser I see this error also, (browser.jpg). hope you can help to this > problem. Thanks. > > MICHAEL ANTHONY S. BALMES > SOFTWARE ENGINEER > <image002.gif> > 10 Toh Guan Road #02-01 > T.T. International Building > Singapore 608838 > Email Address: mikebal...@jupinno.com > > > > <sakaioae in putty.JPG> > <browser.JPG> > > _______________________________________________ > oae-dev mailing list > oae-dev@collab.sakaiproject.org > http://collab.sakaiproject.org/mailman/listinfo/oae-dev > > _______________________________________________ > oae-dev mailing list > oae-dev@collab.sakaiproject.org > http://collab.sakaiproject.org/mailman/listinfo/oae-dev
_______________________________________________ oae-dev mailing list oae-dev@collab.sakaiproject.org http://collab.sakaiproject.org/mailman/listinfo/oae-dev
