sectorix/metasploit-framework — pull request #2 by todb-r7 (2012-09-26 13:55:30+00:00)
Title: Module enumdb

This resolves the conflicts around @sectorix 's clone of rapid7/metasploit-framework.

The commits relevant to the update to enum_db are b1226ab f51f4c1 and 3efe9ac . The whitespace fix is 5bd3953 and the merge conflict resolution was e7281e0

You will want to rebase against rapid7/metasploit-framework pretty much any time, and especially right before you start making changes. This will ensure that you are on the latest version of everything, and will help to avoid merge conflicts. Ultimately, though, I think it's the resaving the module with CRLF's is what did you in.

Periodic rebasing is covered here: https://github.com/rapid7/metasploit-framework/wiki/Metasploit-Development-Environment#wiki-sync

Removing CRLFs using Vim is here:

http://vim.wikia.com/wiki/File_Format#Converting_the_current_file

Landing this pull request in @sectorix's repository *should* resolve the merge issues noted on rapid7/metasploit-framework#835 .