jclouds-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Ignasi Barrera <notificati...@github.com>
Subject Re: [jclouds] Promote rackspace cloudfiles6 (#705)
Date Mon, 06 Apr 2015 22:15:20 GMT
Without rebasing it won't be a linear history. But I think in this case it is OK, because we
are not *adding new code on top of the current one* (which is what we do with PRs and patches);
we are joining two repos, and in this case (IMO) makes much more sense *merging* them instead
of trying to keep a linear history for all the incoming commits.

Also the merge commit shouldn't *complicate* the rebasing of existing PRs, as most of the
commits being merged into this repo are older than the given PRs, and there won't be conflicts
as the incoming files will be seen as *new* files here.

Reply to this email directly or view it on GitHub:
View raw message