GitHub - exdev/urban-survivors: Urban Survivors is a 3D shooting adventure game that tells a funny story.

Branches Tags

Name		Name	Last commit message	Last commit date
Latest commit History 626 Commits
Assets		Assets
Library		Library
Package		Package
Resource		Resource
utility		utility
.gitignore		.gitignore
README		README
output_git_merge_cmds.sh		output_git_merge_cmds.sh
urban_survivors.userprefs		urban_survivors.userprefs

Repository files navigation

Title: urban survivors
Home Page: http://dev.abitgames.com/wiki/urban/WikiStart
Developer Page: http://dev.abitgames.com
Studio Page: http://abitgames.com

== How to merge complex branches? == 
just run "sh output_git_merge_cmds.sh", it will generate a command 
file named git_merges.sh, check this file, edit as you need then execute it by
type "sh git_merges.sh".