= Proposed Git Workflow =

== Goals ==

1. Improve stability of both the server and client software.
2. Lay the foundation for feature branches should we ever decide to use them.

== Branches ==

master = development (currently trunk)

server_stable

client_release_major_minor = release major.minor

== Initial state after migration ==

copy trunk to master

copy server_stable to server_stable

create client_release_X_X as needed

== Local repositories ==

Developers can create feature branches
or separate server and client branches in their local repositories.

== Development ==

All new code goes into master.

Hot fixes get merged into server_stable and/or client_release_X_X if needed.

=== Release Process ===