Releases · makenew/coffeescript-package

This version introduces makenew.sh which automatically bootstraps new projects.
Most of the boilerplate which is normally replaced when making a new project has thus been changed.

This will generate a lot of merge conflicts for exiting projects updating to this version, however all of these can be safely ignored.

Recommend update procedure

Update normally to coffeescript-package-v1.1.0 by following the instructions in the README (merge in the coffeescript-package-v1.1.0 tag instead of upstream/master).

Merge in this version, but only use your file versions. For example,

$ git fetch upstream
$ git merge --no-commit coffeescript-package-v2.0.0
$ git reset .
$ git checkout --ours .
$ git clean -fdx
$ git commit

Update to the latest release normally.

Alternative update option

Depending on how complicated your merge conflicts are, this manual way may be easier.

Checkout this version (or the latest one) into a separate branch, say makenew.
Run ./makenew.sh and enter in the values as if you were recreating your work from scratch. Commit the results.
Create a new branch from your master and merge the makenew branch (do not create a merge commit yet). Compare the makenew branch to your master branch using git diff and whatever git workflow makes sense. One option is to git reset and git checkout, then update each file one at a time until you are satisfied with the merge.