search

wpsharks / phings

Just a few Phings we like to use :-)
GNU General Public License v3.0
1 stars 0 forks source link

Lite Merge Unrelated Histories #114

Closed jaswrks closed 8 years ago

jaswrks commented 8 years ago

@raamdev writes...

[comment-mail-repo/ (master)] $ git merge 000000-dev --strategy=recursive --strategy-option=theirs -m 'Merging 000000-dev into master via Phing.' fatal: refusing to merge unrelated histories

@raamdev also writes...

See this line where --no-single-branch is causing a loss of the full history when the repo is cloned at the start of the release procedure. That needs to go.

jaswrks commented 8 years ago

Next Release Changelog: