Skip to content

armgit / solr

Public Imported from GitHub
0

Apache Solr open-source search software

document handling central versus private branches (#79)

Eric Pughb5743645dbe6
diff --git a/dev-docs/FAQ.adoc b/dev-docs/FAQ.adoc
index 1ea1aa1a588..5d6b004972a 100644
--- a/dev-docs/FAQ.adoc
+++ b/dev-docs/FAQ.adoc
@@ -9,3 +9,12 @@ This document provides a quick reference for frequently questioned concepts and
=== What do I do with NOTICE.txt if I don't have one to satisfy Gradle?
You create an empty file, similar to the `/solr/licenses/antlr4-runtime-NOTICE.txt`
+
+=== What are best practices for branches in Git?
+
+Most committers already use a private fork branch for PRs. Use of central branches
+is ok for very collaborative work, but 95% of the time it is better to use a private
+branch to avoid extra mailing list traffic etc.
+
+Periodically review https://github.com/apache/solr/branches/all to see if you have
+created a branch that can be deleted.