Giter Club home page Giter Club logo

gccg-dev's Introduction

gccg-dev

Generic Collectible Card Game dev super-project

Trees

  • gccg-dev/core/ - git subtree following gccg sf.net core
  • gccg-dev/mythos/ - git submodule linking to external gccg-mythos-data project

Branches

  • master
  • svn-core [svn subtree tracking branch]
  • git-core [git subtree tracking branch]
  • remotes/github/master [github remote master]
  • remotes/github/svn-core [github remote svn-track]
  • remotes/svn-core [git-svn]

Tracking

master -> remotes/github/master svn-core -> (remotes/svn-core) git-core -> (remotes/github/svn-core)

svn-core --subtree--> master:core/

Workflow

Push non-core changes

git push github master

Pull upstream svn

git svn fetch svn-core
git checkout svn-core
git merge remotes/svn-core
git checkout -f master # force because of mythos subtree "overwrite"
git subtree merge -P core --squash -m "merge upstream svn to core subtree" svn-core
git checkout git-core # warning: mythos dir not empty
git merge svn-core    # fast forward
git push github master
git push github git-core:svn-core
git checkout -f master

Push upstream svn

git subtree split -P core -b svn-core
git checkout svn-core
git svn dcommit
git push github git-core:svn-core
# NB! merge following dcommit
git checkout master
git subtree merge -P core --squash -m "merge dcommit" svn-core

gccg-dev's People

Contributors

markferry avatar

Stargazers

 avatar

Watchers

 avatar  avatar  avatar

Forkers

vcgato29

gccg-dev's Issues

Recommend Projects

  • React photo React

    A declarative, efficient, and flexible JavaScript library for building user interfaces.

  • Vue.js photo Vue.js

    ๐Ÿ–– Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.

  • Typescript photo Typescript

    TypeScript is a superset of JavaScript that compiles to clean JavaScript output.

  • TensorFlow photo TensorFlow

    An Open Source Machine Learning Framework for Everyone

  • Django photo Django

    The Web framework for perfectionists with deadlines.

  • D3 photo D3

    Bring data to life with SVG, Canvas and HTML. ๐Ÿ“Š๐Ÿ“ˆ๐ŸŽ‰

Recommend Topics

  • javascript

    JavaScript (JS) is a lightweight interpreted programming language with first-class functions.

  • web

    Some thing interesting about web. New door for the world.

  • server

    A server is a program made to process requests and deliver data to clients.

  • Machine learning

    Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.

  • Game

    Some thing interesting about game, make everyone happy.

Recommend Org

  • Facebook photo Facebook

    We are working to build community through open source technology. NB: members must have two-factor auth.

  • Microsoft photo Microsoft

    Open source projects and samples from Microsoft.

  • Google photo Google

    Google โค๏ธ Open Source for everyone.

  • D3 photo D3

    Data-Driven Documents codes.