ansible/ansible — pull request #3390 by berenddeboer (2013-07-01 02:17:34+00:00)
Title: FreeBSD portinstall module resubmit

Hi Michael, your comments on using github properly much appreciated. Have attempted to do what you said, but it still does not look good (does it really say 43 files changed??)

The:

git pull --rebase upstream devel

worked well, got:

From https://github.com/ansible/ansible
* branch devel -> FETCH_HEAD
First, rewinding head to replay your work on top of it...
Applying: Module to install software on FreeBSD using portinstall
Applying: Updated written by section.
Applying: Very dirty hack to improve check if mysql55-client is installed.
Applying: Delete now works.
Applying: Python likes to compare integers with integers.
Applying: Always removing digits doesn't really work well.

Then I did "git rebase devel", but had to do git rebase --skip a few times.

Apologies again for my lack of knowledge. Have not used pull requests with forked branches before.