git-totara-upgrade

Eases the process of upgrading a modified Totara codebase by working out which conflicts can be automatically accepted.

Installation

chmod +x install.sh

sudo ./install.sh

Usage

git totara-upgrade [GIT-REMOTE] [TAG-TO-UPGRADE-FROM] [TAG-TO-UPGRADE-TO]

git totara-upgrade upstream totara-2.5.27 totara-2.7.3

Docs

See comments within source.