Home

Welcome to the roll20-character-sheets wiki!

How to Sync Your Fork with Master

The easiest way to keep your fork updated with master is using Pull which is a GitHub app. Just add this app to your repository and it will do the work for you.

If you wish to update your fork manually follow the guilde below. Full details can be found on Syncing a Fork in GitHub Help. You will need to have an upstream remote configured.

Terminal Commands

1. git fetch upstream
2. git checkout master
3. git merge upstream/master

Github Via Command Line

Creating a New Branch

1. Before starting a new project always make sure you are on the master branch and git pull to ensure it is up to date.

2. Do git checkout -b nameofbranch . This will create a new branch and check it out. If you did Step 1 the branch will be the same as master.

3. Get to work on your feature. Every time you're done for the day or taking a break upload your changes to save them. See section below.

Saving Progress & Working Together

4. If you are sharing a branch with some one it is a best practice to git pull before you start your work. Do this each work session in order to keep your files up to date.

5. Save work frequently to prevent loosing work. Do get git status to monitor your changes. Typically in console red text means changes have been made but they have not been added. To add changes for commitment do git add + the name of the file. Pressing tab in command line will auto complete file names when possible and will save you time. After doing add do another git status. The file text should now be green indicating the files have been added but not committed. If you are working with some one else now is a good time to git pull again to grab their changes.

6. If you have conflicts from step 2 as part of a git pull, search for those in your text edit. Look for <<<<< and you'll find them. Use your best judgement to resolve these conflicts.

7. When the files are added (showing green text) and you've resolved any conflict then you are ready to commit. Do git commit -m "comment about the commit" to add a commit with a comment. Then do git push.

Merging commits

8. Go to GitHub and you'll see your branch from the steps above has been added.

9. Create a pull request on GitHub from your branch to master. Review the changes you are submitting for accuracy.

10. Resolve any merge conflicts as needed in browser, directions.

11. After resolving any concerns/conflicts, your files will be Squash and Merge into master.