The merge commit preserves all the history from both existing master and
sentry-ha-redesign branch.
On Fri, Jul 28, 2017 at 6:27 PM, Sergio Pena
wrote:
> Does the merge commit still leaves the history of sentry-ha-redesign? Or it
> wraps all those commits into one single merge commit?
>
> If we
Does the merge commit still leaves the history of sentry-ha-redesign? Or it
wraps all those commits into one single merge commit?
If we do leave the history, then it would be fine to do it.
On Fri, Jul 28, 2017 at 11:23 AM, Alexander Kolbasov
wrote:
> This seems to be the only available option
This seems to be the only available option if we can't delete master. But
this will create merge commit. So far we were avoiding merge commits, but
it may be ok in this case. What do you guys think - is it ok to introduce
merge commit to move sentry-ha-redesign to master?
On Fri, Jul 28, 2017 at 1
Instead of deleting the branch, we could look at doing something like the
answer suggested here:
https://stackoverflow.com/questions/2862590/how-to-replace-master-branch-in-git-entirely-from-another-branch
git checkout sentry-ha-redesign
git merge -s ours master
git checkout master
git merge sent
