Dave, I don't know the answer to that one... I've been basically been following the model of (almost) never working on my local master branch, except to do a merge and push as you said... I believe this is the "recommended" way to do things.
Mark ________________________________________ From: [email protected] [[email protected]] On Behalf Of Dave Thomas [[email protected]] Sent: Friday, February 10, 2012 7:50 PM To: [email protected] Subject: Re: [OPENMRS-DEV] HTML Form Entry Sprint I guess i don't totally understand the best order to proceed in if I have both local changes to my branch (uncommitted), and the repo on github has significant changes to the master branch since last time i did a fetch. What's the correct order of steps in this case, assuming the the local branch is also 'master'? I got myself into trouble a couple of times where EGit was telling me i had merge conflicts even though 'synchronize' and the eclipse merge tool were showing me identical files. Sigh... I'm thinking that the most success I've had this week is to never do any local work on my local master branch, other than using it for doing a quick merge from a local development branch, and final push to the github repo? d On Fri, Feb 10, 2012 at 3:15 PM, Darius Jazayeri <[email protected]<mailto:djazayeri%[email protected]>> wrote: I found git to be slightly more complicated than svn, but this is the first time I've really used it, so that's to be expected. I didn't ever create a branch, or switch between branches, since the only big ticket I worked on was in a separate module. (And I'm sure that if I had I'd be singing Git's praises.) One nice thing is that it lets us avoid checking in the eclipse-specific project files, and keeping those local. I ran into an annoyance with the EGit plugin--the first time I did a push, I typed the wrong password, and it has remembered it ever since, and I couldn't figure out how to make it forget. So I haven't been able to push from eclipse. Instead I've been using the github osx app, which is quite nice. -Darius On Fri, Feb 10, 2012 at 2:14 PM, Mark Goodrich <[email protected]<mailto:[email protected]>> wrote: We have reached the end of the two-week HTML Form Entry sprint. First of all, I’d like to thank everyone for their hard work and participation… we made it though more tickets than I had anticipated, and I enjoyed collaborating with everybody. We have closed a total of 25 tickets over the past two weeks, and should be closing a few more in the coming week. To talk about next steps… we still have 8 “in progress” tickets and 4 in the “post-commit” stage. Some of these are on my plate, and I plan to continue working on them next week. For anybody who still is assigned to a ticket that is “In Progress”, please let me know if you think you’ll still be able to finish the ticket, and, if not, what work remains . For those of you awaiting the next release of the module, version 1.9, my target is to release it sometime near the end up of week of February 27th. The delay is because I’m going to be out of the office for significant parts of the next two weeks, and because I’d like our ace volunteer tester, Cordt Byrne, to do some testing further testing before release, and he is only in the office once a week. Also, if any of the developers would like to share their experience working with Git, that would be much appreciates as we debate whether we want to migrate OpenMRS core from subversion to Git. Thanks again everyone… Take care, Mark ________________________________ Click here to unsubscribe<mailto:[email protected]?body=SIGNOFF%20openmrs-devel-l> from OpenMRS Developers' mailing list ________________________________ Click here to unsubscribe<mailto:[email protected]?body=SIGNOFF%20openmrs-devel-l> from OpenMRS Developers' mailing list ________________________________ Click here to unsubscribe<mailto:[email protected]?body=SIGNOFF%20openmrs-devel-l> from OpenMRS Developers' mailing list _________________________________________ To unsubscribe from OpenMRS Developers' mailing list, send an e-mail to [email protected] with "SIGNOFF openmrs-devel-l" in the body (not the subject) of your e-mail. [mailto:[email protected]?body=SIGNOFF%20openmrs-devel-l]
