Re: [dspace-tech] How to branch in GitHub?

2018-08-10 Thread Evgeni Dimitrov
Hopefully all done. Thank you again. On Friday, August 10, 2018 at 3:55:07 PM UTC+3, helix84 wrote: > > On Fri, Aug 10, 2018 at 2:48 PM Evgeni Dimitrov > wrote: > >> Eventually something got very wrong, because the pull request appeared as >> request to merge to DSpace:master. >> > > When you're

Re: [dspace-tech] How to branch in GitHub?

2018-08-10 Thread helix84
On Fri, Aug 10, 2018 at 2:48 PM Evgeni Dimitrov wrote: > Eventually something got very wrong, because the pull request appeared as > request to merge to DSpace:master. > When you're creating a pull request in GitHub, you have to choose the target branch in the GitHub web interface. Please, close

Re: [dspace-tech] How to branch in GitHub?

2018-08-10 Thread Evgeni Dimitrov
Eventually something got very wrong, because the pull request appeared as request to merge to DSpace:master. Sorry... On Friday, August 10, 2018 at 3:19:07 PM UTC+3, Evgeni Dimitrov wrote: > > Thank you, > > It worked with > > git checkout upstream/dspace-6_x > > Best regards > Evgeni > > On Fri

Re: [dspace-tech] How to branch in GitHub?

2018-08-10 Thread Evgeni Dimitrov
Thank you, It worked with git checkout upstream/dspace-6_x Best regards Evgeni On Friday, August 10, 2018 at 3:08:26 PM UTC+3, helix84 wrote: > > Are you following the guide we wrote? This chapter talks about how to set > up a tracking branch: > > > https://wiki.duraspace.org/display/DSPACE/De

Re: [dspace-tech] How to branch in GitHub?

2018-08-10 Thread helix84
Are you following the guide we wrote? This chapter talks about how to set up a tracking branch: https://wiki.duraspace.org/display/DSPACE/Development+with+Git#DevelopmentwithGit-Option2-%22cherry-pick%22changesfrommastertoreleasebranch That's how you get a branch from upstream repo into your loca

Re: [dspace-tech] How to branch in GitHub?

2018-08-10 Thread Evgeni Dimitrov
Thank you helix84, When I did in the beginning >git remote add upstream git://github.com/DSpace/DSpace.git >git fetch upstream I got: remote: Counting objects: 287, done. remote: Compressing objects: 100% (7/7), done. Rremote: Total 287 (delta 113), reused 126 (delta 113), pack-reused 160 Receiv

Re: [dspace-tech] How to branch in GitHub?

2018-08-10 Thread helix84
# first switch to the dspace 6 branch: git checkout dspace-6_x # then create a new identical branch as the current one and name it DS-3974 git checkout -b DS-3974 git remote add upstream git://github.com/DSpace/DSpace.git # this was a one-time operation which allows you to pull latest changes fro