El 09/10/14 a les 21:46, Monika Mevenkamp ha escrit: > I have trouble getting a clean PR together. Here is what I tried > > I started with my branch > https://github.com/akinom/DSpace/commits/DS-1905-checker-emailer > which is based on 1.8_x - sighh we are way behind > > git checkout DS-1905-checker-emailer > <https://github.com/akinom/DSpace/commits/DS-1905-checker-emailer> > git rebase -s recursive -X theirs upstream/master > > I interpret that the --theirs option favors the changes from upstream > > This produces lots of conflicts of the 'deleted in upstream - left file > on file system'. > For some reason rebase gets all upset about pom.xml files and not about > all the other files that moved. > > I did > rm offender-file > git rm offender-file > whenever that happened > > A couple cases there were complaints that a file was 'modified by both' > > so I tried with > git revert HEAD -- offender-file > git checkout --theirs -- offender-file > > and whenever conflicts went away I did rebase --continue > > > I ended up with something that shows files differing that should really > not be part of this. > > Before I go ahead and try to cherry-pick - is there some git feature I > should know/try ? > > Monika > > <https://github.com/akinom/DSpace/commits/DS-1905-checker-emailer> > On 10/7/14, 4:24 PM, Hardy Pottinger wrote: > > > > Hi, the DSpace 5.0 release team is reviewing feature pull requests for > > possible inclusion for DSpace 5.0, and we see that this PR is not yet > > complete. We'd like to ask if you foresee being able to complete this > > work in progress by October 14? If there's anything we can do to help, > > please don't hesitate to ask. Thanks! > > > > — > > Reply to this email directly or view it on GitHub > > <https://github.com/DSpace/DSpace/pull/489#issuecomment-58254765>. > > > > -- > Monika Mevenkamp > phone: 609-258-4161 > 123 693 Alexander Street, Princeton University, Princeton, NJ 08544 > > > > ------------------------------------------------------------------------------ > Meet PCI DSS 3.0 Compliance Requirements with EventLog Analyzer > Achieve PCI DSS 3.0 Compliant Status with Out-of-the-box PCI DSS Reports > Are you Audit-Ready for PCI DSS 3.0 Compliance? Download White paper > Comply to PCI DSS 3.0 Requirement 10 and 11.5 with EventLog Analyzer > http://pubads.g.doubleclick.net/gampad/clk?id=154622311&iu=/4140/ostg.clktrk > > > > _______________________________________________ > 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 >
Hi Monika, I think in these cases it's better to do something like this to avoid these conflicts: git checkout DS-1905-checker-emailer git rebase --onto master 1234^ where 1234 would be the id of the first commit you made in DS-1905-checker-emailer. This way you avoid the commits that modify the pom.xml. Not sure about -s and -X parameters. Cheers, Àlex ------------------------------------------------------------------------------ Comprehensive Server Monitoring with Site24x7. Monitor 10 servers for $9/Month. Get alerted through email, SMS, voice calls or mobile push notifications. Take corrective actions from your mobile device. http://p.sf.net/sfu/Zoho _______________________________________________ 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
