kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Document policy against merges in a feature branch

This commit is contained in:
Travis Cross 2014-09-18 20:02:19 +00:00
parent 527016cdec
commit 58110da870
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
docs/SubmittingPatches
View File

@ -129,6 +129,17 @@ If you believe your patch resolves the issue in question, follow the
issue number with a space and the "#resolve" directive as in the issue number with a space and the "#resolve" directive as in the
example above. example above.
Avoid Merges
------------
When you've created a local git branch to make and test your changes,
it can be tempting to merge that branch periodically against our git
HEAD, particularly if the branch lingers for some time. Don't do
this. Instead, please rebase your branch onto our tree before
submitting the commits to us. Random "update branch to master" merges
make our history hard to understand and make it more difficult to
isolate regressions with `git-bisect`.
Do As We Say... Do As We Say...
--------------- ---------------