Re: [Dspace-tech] Using Git to Update

2013-08-13 Thread helix84
On Tue, Aug 13, 2013 at 12:25 PM, Sean Carte wrote: > > On 13 August 2013 12:10, helix84 wrote: >> >> no worries, we've all been through this. To overwrite your local >> changes in one file with the upstream version of that file, do >> >> git checkout dspace/config/dspace.cfg > > > Thanks, Ivan.

Re: [Dspace-tech] Using Git to Update

2013-08-13 Thread helix84
Hi Sean, no worries, we've all been through this. To overwrite your local changes in one file with the upstream version of that file, do git checkout dspace/config/dspace.cfg Should you have many locally mddified files and you wish to throw away the changes, I know of two ways to do that, but us

[Dspace-tech] Using Git to Update

2013-08-13 Thread Sean Carte
I'm totally new to git and totally confused; I'd be grateful if someone could tell me where I'm going wrong. dspace-src-git is my current 3.1 src directory. Following Tim Donohue's Development With Git wiki page, I did the following: dspace@ubuntu:~$ cd dspace-src-git/ dspace@ubuntu:~/dspace-src