search

GrailsInAction / graina2

Source code for the 2nd edition of Grails in Action
90 stars 92 forks source link

Fix string index to update the day field of now. #45

Closed marcpa00 closed 11 years ago

marcpa00 commented 11 years ago

For issue #44

dayOfMonth is not a valid key for the Map passed to Date.updated() : use date, could also use Calendar.DAY_OF_MONTH.

Sorry for the messy pull request, only commit 5bf49fb is relevant, rest is me-learning-github-by-making-mistakes :-)

marcpa00 commented 11 years ago

I've went a little further using constants from Calendar and updated the BootStrap of every chapter in https://github.com/marcpa00/graina2/commit/bbd10dc04abd4bf57bc723647734fba99b1a9e24

pledbrook commented 11 years ago

Can you please rebase against master and resubmit? Thanks.

marcpa00 commented 11 years ago

Will do as soon as I figure out how to clean up my repo. I'm tempted to remove my fork on githup and re-create it from scratch, but I am afraid to impact GrailsInAction/graina2 ?

pledbrook commented 11 years ago

Re-forking will not affect the main repo, so go ahead. And the best way to submit patches is:

  1. Pull from upstream (GrailsInAction/graina2) into your local master branch
  2. Create a new local branch from master
  3. Commit your changes to this new local branch
  4. If GrailsInAction/graina2 has changed since you created the local banch:
    1. Pull from upstream into your local master again
    2. git checkout <new branch>
    3. git rebase master
  5. When ready to submit pull request, push the new branch to your fork on GitHub
  6. Submit the pull request from your new branch, not master

I like to do interactive rebase to squash commits like "missing from previous commit" or "minor fix" or "merge" before pushing, but it's not critical.

marcpa00 commented 11 years ago

Great, thanks for the clear instructions ! I think I got it now. Pull request #47.

marcpa00 commented 11 years ago

Closing this pull request as it is superceeded by #47.