<p>How do I get a patch from a commit in order to send it to another developer? And how do I best avoid a merge conflict with this patch when merging our trees at a later date?</p>

<p>If you know how please explain how to do this in your VCS of choice such as subversion, git, Mercurial, bzr or etc.</p>

In SVN you can simply make your changes then before commiting, pipe the output of the svn diff to a file as such
```
```
svn diff > mypatch.diff
```
```
you can then revert your changes and apply the patch at a later date using
```
```
patch -p0 -i mypatch.diff
```
```
As always don't blindly apply patches to your code and always inspect them first.
You may also find that the patch will break your source code if the source files have changed significantly enough since the patch was taken.
You also can not guarantee that there will not be merge conflicts when you attempt to check in the code.