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-git$ git remote add upstream
https://github.com/DSpace/DSpace.git
dspace@ubuntu:~/dspace-src-git$ git fetch upstream
warning: no common commits
remote: Counting objects: 82061, done.
remote: Compressing objects: 100% (25541/25541), done.
remote: Total 82061 (delta 43759), reused 80072 (delta 41987)
Receiving objects: 100% (82061/82061), 83.25 MiB | 51 KiB/s, done.
Resolving deltas: 100% (43759/43759), done.
>From https://github.com/DSpace/DSpace
* [new branch] dspace-1_2_2-patches -> upstream/dspace-1_2_2-patches
* [new branch] dspace-1_2_2-update -> upstream/dspace-1_2_2-update
* [new branch] dspace-1_4_x -> upstream/dspace-1_4_x
* [new branch] dspace-1_5_x -> upstream/dspace-1_5_x
* [new branch] dspace-1_6_x -> upstream/dspace-1_6_x
* [new branch] dspace-1_7_x -> upstream/dspace-1_7_x
* [new branch] dspace-1_8_x -> upstream/dspace-1_8_x
* [new branch] dspace-3_x -> upstream/dspace-3_x
* [new branch] master -> upstream/master
>From https://github.com/DSpace/DSpace
* [new tag] dspace-1.7.3 -> dspace-1.7.3
* [new tag] dspace-1.8.3 -> dspace-1.8.3
* [new tag] dspace-3.0 -> dspace-3.0
* [new tag] dspace-3.0-rc1 -> dspace-3.0-rc1
* [new tag] dspace-3.0-rc2 -> dspace-3.0-rc2
* [new tag] dspace-3.0-rc3 -> dspace-3.0-rc3
* [new tag] dspace-3.1 -> dspace-3.1
* [new tag] dspace-3.2 -> dspace-3.2
dspace@ubuntu:~/dspace-src-git$ git checkout master
M dspace/config/dspace.cfg
Already on 'master'
dspace@ubuntu:~/dspace-src-git$ git merge upstream/master
error: Your local changes to the following files would be overwritten by
merge:
dspace/config/dspace.cfg
Please, commit your changes or stash them before you can merge.
Aborting
So my question is: how do I update dspace.cfg?
I'm really lost at this point.
Sean
--
------------------------------------------------------------------------------
Get 100% visibility into Java/.NET code with AppDynamics Lite!
It's a free troubleshooting tool designed for production.
Get down to code-level detail for bottlenecks, with <2% overhead.
Download for free and get started troubleshooting in minutes.
http://pubads.g.doubleclick.net/gampad/clk?id=48897031&iu=/4140/ostg.clktrk
_______________________________________________
DSpace-tech mailing list
DSpace-tech@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/dspace-tech
List Etiquette: https://wiki.duraspace.org/display/DSPACE/Mailing+List+Etiquette
