3 ms·
Why not rebase master into your branch, rebase your branch locally to clean it up, then merge it back into master? That way you get the best of both worlds.
by StavrosK 10y ago
Why not rebase master into your branch, rebase your branch locally to clean it up, then merge it back into master? That way you get the best of both worlds.