mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-09-09 03:01:18 +02:00
The current guides have a few areas where they recommend an approach that is more complex than what most people take. - Rebase straight onto upsteam/msaster - Force push a rebased branch I also fixed the conflict resolution help to be relevant to rebase commands, and kept the push instruction out of the rebase instruction. |
||
---|---|---|
.. | ||
code.md | ||
documentation.md | ||
index.md | ||
issues.md | ||
translation.md |