Thanks both of you. I am going to improve it with my next pull request. I did the recreation of the master branch and will use pull instead of fetch.
Regards Christian Am 13.01.2015 um 08:59 schrieb Àlex Magaz Graça: > El 12/01/15 a les 15:55, Christian Scheible ha escrit: >> Hi Helix, >> >> I think the problem is that I messed up my first branch and merged it >> with the master. Because I am allways doing this: >> >> 1. git checkout master >> 2. git fetch upstream >> 3. git branch DS-X >> 4. git checkout DS-X >> 5. make changes >> 6. git commit >> 7. git push origin >> >> or is the problem that I do git fetch upstream instead of git pull >> upstream master? >> >> I am going to include more information about the bugs and what the fixes >> are doing. >> >> Regards >> Christian >> >> Am 12.01.2015 um 15:20 schrieb helix84: >> > Hi Christian, >> > >> > I'm looking at your PRs. Don't worry that they're not perfect, the >> > important thing is that the code is out there. We can take an >> > individual commit (git cherry-pick) from it. I was thinking what might >> > have gone wrong on your end and my guess is that you're not starting >> > from the master branch. Before you create a new branch, make sure to >> > checkout master (git checkout master) and update it (git pull upstream >> > master). Then you can create a new branch, which can be used as a >> > source for PR that will contain only the relevant commit(s). >> > >> > I also looked briefly at the bugs. It would help to include more >> > detail about the problem so that the fixes can be quickly tested. It >> > will help to include detailed steps to reproduce, expected and actual >> > behaviour. >> > >> > Thanks. >> > >> > Regards, >> > ~~helix84 >> > >> > Compulsory reading: DSpace Mailing List Etiquette >> > https://wiki.duraspace.org/display/DSPACE/Mailing+List+Etiquette >> > >> > >> >> > > Hi Christian, > > You are missing a 'git merge upstream/master' after step 2. > Alternatively, you could also run git pull instead of steps 1 and 2, as > it says in the Development with Git wiki page [1]: > > "The pull command executes git fetch, which retrieves the actual > changes followed by git merge, putting the changes in your codebase." > > [1] > https://wiki.duraspace.org/display/DSPACE/Development+with+Git#DevelopmentwithGit-OverviewoftheGitLifecycle > > Cheers, > Àlex > > -- Christian Scheible Softwareentwickler / Abt. Content-basierte Dienste Kommunikations-, Informations- und Medienzentrum (KIM) Universität Konstanz 78457 Konstanz +49 (0)7531 / 88-2857 Raum B 703 ------------------------------------------------------------------------------ New Year. New Location. New Benefits. New Data Center in Ashburn, VA. GigeNET is offering a free month of service with a new server in Ashburn. Choose from 2 high performing configs, both with 100TB of bandwidth. Higher redundancy.Lower latency.Increased capacity.Completely compliant. http://p.sf.net/sfu/gigenet _______________________________________________ DSpace-tech mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/dspace-tech List Etiquette: https://wiki.duraspace.org/display/DSPACE/Mailing+List+Etiquette
