Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Lite Merge Unrelated Histories #114

Closed
jaswrks opened this issue Jun 18, 2016 · 1 comment
Closed

Lite Merge Unrelated Histories #114

jaswrks opened this issue Jun 18, 2016 · 1 comment
Labels
bug

Comments

@jaswrks
Copy link
Contributor

jaswrks commented Jun 18, 2016 •
edited
Loading

@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 jaswrks added the bug label Jun 18, 2016
jaswrks pushed a commit that referenced this issue Jun 18, 2016
Bug fix in lite clone. See: #114
7abca15
@jaswrks jaswrks mentioned this issue Jun 18, 2016
Merged
jaswrks pushed a commit that referenced this issue Jun 18, 2016
Merge pull request #115 from websharks/feature/114
8b39256 
Bug fix in lite clone. See: #114
@jaswrks
Copy link
Contributor Author

jaswrks commented Jun 18, 2016

Next Release Changelog:

@jaswrks jaswrks closed this as completed Jun 18, 2016
jaswrks pushed a commit that referenced this issue Jun 18, 2016
Removing --depth=1 also. See: #114
b9760cc
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
bug
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
1 participant
@jaswrks