Re: [PATCH 3/3] rebase: refuse to rebase with -s ours
From: Johannes Schindelin <hidden>
Date: 2016-06-15 22:47:43
Possibly related (same subject, not in this thread)
- 2016-06-15 · Re: [PATCH 3/3] rebase: refuse to rebase with -s ours · Junio C Hamano <hidden>
- 2016-06-15 · Re: [PATCH 3/3] rebase: refuse to rebase with -s ours · Johannes Schindelin <hidden>
- 2016-06-15 · Re: [PATCH 3/3] rebase: refuse to rebase with -s ours · Junio C Hamano <hidden>
- 2016-06-15 · Re: [PATCH 3/3] rebase: refuse to rebase with -s ours · Sverre Rabbelier <hidden>
- 2016-06-15 · Re: [PATCH 3/3] rebase: refuse to rebase with -s ours · A Large Angry SCM <hidden>
Hi, On Sun, 15 Nov 2009, Thomas Rast wrote:
Using the "ours" strategy with rebase just discards all changes, turning <branch> into <upstream> (or <newbase> if given). This is unlikely to be what the user wants, so simply refuse to do it.
"Unlikely" or "impossible"? Besides, I find it rather arbitrary that the "ours" strategy is refused, but none of the user-provided merge strategies. IOW disallowing "ours" may very well foster unreasonable expectations. Ciao, Dscho