Home

Welcome to the Alpaca wiki!

Testing and Git

HEAD to testing branch. There you have a sample application you develop. It has styles, page content et cetera. When you are ready commit something, do it as follows:

1. First, stage the changes that are part of the sample application
2. Commit and push to origin/testing
3. Stash the changes that are considered to be a part of the Alpaca core
4. Switch to master
5. Apply the stash you just made
6. Commit and push!

Then, you can switch back to testing and merge master to it!