Revised the merge / rebase instructions - Make it clear that rebase is best for short-term, everyday developer parallelism - Instructions for using merge to reintegrate longer-running forks
Revised the merge / rebase instructions
- Make it clear that rebase is best for short-term, everyday developer parallelism
- Instructions for using merge to reintegrate longer-running forks
jakzale/ogre,jakzale/ogre,jakzale/ogre,jakzale/ogre,jakzale/ogre