Skip to content

Upgrade to JNA 4.0#64

Closed
ryantxu wants to merge 5 commits intoWaffle:masterfrom
ryantxu:master
Closed

Upgrade to JNA 4.0#64
ryantxu wants to merge 5 commits intoWaffle:masterfrom
ryantxu:master

Conversation

@ryantxu
Copy link
Copy Markdown
Contributor

@ryantxu ryantxu commented Aug 26, 2013

Here is a patch to upgrade to JNA 4.0

It also updates the junit and guava deps while we are at it.

Let me know if I can do anything to make this easier.

thanks
ryan

@dblock
Copy link
Copy Markdown
Collaborator

dblock commented Aug 27, 2013

Merged in 2551226, thank you. Much appreciated, great work.

A few things for next time:

  • Try to make squashed and/or rebased pull requests for a single feature or bug, this just aggregates all commits together, avoids useless "merged from xyz" commits. Read up on those.
  • Don't work on master, create a topic branch off master before you start doing work. Make pull requests from the branch. Typically this means:
git checkout master
git pull upstream master
git checkout -b new-branch
...
git push origin new-branch

I made a squashed merge, so now you have to rewind your master. Most likely this is:

git checkout master
# save any current changes
git checkout -b my-current-changes
git checkout master
# reset back 10 commits
git reset HEAD~10
# sync from master
git pull upstream master
# force push to github, overwriting any changes (my-current-changes will still have your code, just in case)
git push origin master -f
  • Update CHANGELOG.

@dblock dblock closed this Aug 27, 2013
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants