kikotheexile / Endless-Sky-Civil-War

A stand alone, content driven Endless Sky fork.
22 stars 17 forks source link

Add script to help with merging history from ES. #142

Closed petervdmeer closed 3 years ago

petervdmeer commented 3 years ago

Feature: Add script to help with merging history from ES.

Feature Details

This script takes away some bulk-work when merging from ES to ES Stories. Having the ability to easily merge from ES to ES Stories allows more regular updates.

UI Screenshots

N/A

Usage Examples

Use the script in the merge-process where you would normally perform git merge <ES-master-branch>. Make sure that any merge gets merged using merge-commits (not squash commits) to allow for more easy code transfers in the future.