On Mon, Jun 25, 2012 at 09:06:56PM -0400, [email protected] wrote: >On 2012-Jun-25, Magnus Therning wrote: >>On Mon, Jun 25, 2012 at 12:29:26PM -0400, [email protected] wrote: >>>Thanks for this advice and also Magnus's. >>> >>>I've made some progress, and have made a pull request to >>>archhaskell/habs -- my first contribution to the project! >>> >>>But since then I've pulled from archhaskell/habs and have conflicts >>>in cblrepo.db. What is the best thing to do here -- should I try to >>>resolve the conflicts on my end (and make another pull request?) or >>>will Magnus resolve the conflicts (assuming he accepts my pull >>>request) and I fetch them later? >> >>It's always best to make sure your changes are rebased onto >>habs/master, that makes it trivial to pull them. > >Always, or usually? > >I think I understand how this would usually be helpful, but not >always, and not in the current case. >My understanding of "rebase" is not as clear as I would like, but it >seems to me that the two main uses are >(1) to collapse a series of commits into a single commit, and >(2) to convert a series of committed snapshots, beginning at A >and culminating in C, >into a series of patches (differences), >move backward (or maybe forward) to some other commit B in the history, >and "replay" or apply the patches >from there, resulting in a new snapshot C' which >can then be easily merged in to succeed B. > >(1) does not apply in this case, because I made only a single commit. > >(2) could have been helpful if commits were made in habs/master >(meaning, I think, archhaskell/habs master) between the time of my fork >and the time of my pull request, but if I read the network graph >correctly, the commits in archhaskell/habs were made after my pull >request. Consequently, if I had done a rebase at the time, C' would have >been identical with C. > >Do I understand this correctly?
Yes. /M -- Magnus Therning OpenPGP: 0xAB4DFBA4 email: [email protected] jabber: [email protected] twitter: magthe http://therning.org/magnus I invented the term Object-Oriented, and I can tell you I did not have C++ in mind. -- Alan Kay
pgpgcE5I3Pfgk.pgp
Description: PGP signature
_______________________________________________ arch-haskell mailing list [email protected] http://www.haskell.org/mailman/listinfo/arch-haskell
