Sorry, forgot to cc the list. Yura Begin forwarded message: > From: Yura Zenevich <yura.zenevich@gmail.com> > Subject: Re: [Tech] Push to master > Date: 3 April, 2012 10:49:23 AM EDT > To: Patrick Schmitz <pschmitz@berkeley.edu> > > Hi Patrick, > > Thanks for your changes. I did however notice that you pushed the branch you had your changes done into the collectionspace/ui master. That resulted in a "flip" of the graph where your local branch (you had your changes in) became collectionspace/ui master. While technically the codebase is intact the commit history became somewhat unreadable as you can see in the last commit: > https://github.com/collectionspace/ui/commit/ff3049e27082000d633aaf66a06056cef7293773 It looks like inventory related changes were made. > > I would suggest the following workflow when committing new changes: > > - have your branch with changes published to github so it could be tracked > - fetch the latest version of collectionspace/ui master > - while in collectionspace/ui master merge the branch with new changes into it using > git merge --no-ff --log BRANCH_NAME > - push changes and merge back into collectionspace/ui master (while still in collectionspace/ui master) using > git push origin master (where origin is collectionspace/ui master) > > I fixed up the history and you can see it in this branch: https://github.com/collectionspace/ui/tree/fixedMaster. > If nobody minds I'll replace collectionspace/ui master with fixedMaster branch to fix up the history. This however means that if somebody pulled the latest change from master (which i believe is unlikely) they would have to remove the tracking and refetch it anew after the update. Hope that is ok? > > Regards, > > Yura > > On 2012-04-03, at 1:26 AM, Patrick Schmitz wrote: > >> Hi Yura - >> >> Please take a look at the push I just did to UI. Most of it is obvious and not consequential (changes to lifesci tenant resources). >> >> Demands.js has added the support for Taxonomy, but should not be a big deal >> >> RecordList.js has the one possibly significant change, to selectNavigateVocab(). As I was testing taxon, this was necessary to get it to work, and all the other tests I did on other vocabs worked. However, you expressed some concern that it might not handle all the cases, so please take a look. >> >> Thanks - Patrick >> _______________________________________________ >> Tech mailing list >> Tech@lists.collectionspace.org >> http://lists.collectionspace.org/mailman/listinfo/tech_lists.collectionspace.org >