Pinned Loading

1. How to use `git mergetool` to resolv... How to use `git mergetool` to resolve conflicts

   1

   # Awesome git

   2

   3

   ## General tutorial

   4

   * [Kickstart tutorial](https://gist.github.com/jtebert/6d7367a3d6134aced57b6a3bf2bc11fc)

   5

   * [Must-read tutorial: the concepts of branching and merging](http://www.sbf5.com/~cduan/technical/git/git-3.shtml) note the collaborating link at the bottom

2. mer0mingians-sta-notes mer0mingians-sta-notes Public

   Some notes and learnings about playing Star Trek Adventures.

   CSS

3. sta2e-fanpage-template sta2e-fanpage-template Public template

   This repo contains the homepage data from our Star Trek Adventures 2E round with the U.S.S. Hamilton.

   CSS

4. sta2e-uss-hamilton sta2e-uss-hamilton Public

   Python