From a67a13cdb710afb668a6c1766fb92bbccaeabb1b Mon Sep 17 00:00:00 2001 From: Tod Beardsley Date: Fri, 4 May 2012 12:42:32 -0500 Subject: [PATCH] --- dev/Metasploit-Development-Environment.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/Metasploit-Development-Environment.md b/dev/Metasploit-Development-Environment.md index 02324744b4..23bd1b84c4 100644 --- a/dev/Metasploit-Development-Environment.md +++ b/dev/Metasploit-Development-Environment.md @@ -288,7 +288,7 @@ Depending on the position of the stars, someone from the Metasploit core develop [[/screens/pull06.png]] -Now, keep in mind that actually landing a pull request is a little more involved than just taking your commit and applying it directly to the tree. Usually, there are a few changes to be made, sometimes there's some back and forth on the pull request to see if some technique works better, etc. To have the best chances of actually getting your work merged, you would be wise to consult the [[Acceptance Guidelines]]. +Now, keep in mind that actually [[landing a pull request]] is a little more involved than just taking your commit and applying it directly to the tree. Usually, there are a few changes to be made, sometimes there's some back and forth on the pull request to see if some technique works better, etc. To have the best chances of actually getting your work merged, you would be wise to consult the [[Acceptance Guidelines]]. The upshot is, what's committed to Metasploit is rarely exactly what you initially sent, so once the change is committed, you'll want to rebase your checkout against master to pick up all the changes. If you've been developing in a branch (as you should), you shouldn't hit any conflicts with that.