Thread (12 messages) 12 messages, 6 authors, 2016-06-15

Re: Odd merge behaviour involving reverts

flat view

From: Linus Torvalds <torvalds@linux-foundation.org>
Date: 2016-06-15 22:45:48


On Thu, 18 Dec 2008, Jay Soffian wrote:
Instead of reverting the revert, why not rebase the branch which was
merged to the point after the revert was done?
Sure, you can do that too. However, that has its own set of problems, ie 
all the "ok, who else was working based on this branch" thing.

But no, there are no single right answers. Rebasing may well be a 
reasonable approach.

		Linus
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help