Hi Colin,
On 09/08/2014 01:25 PM, Colin Yates wrote:
My understanding is that rebasing branch B onto branch A unrolls all
of branch B's commits and then reduces them onto the HEAD of branch
A.
For example, I took featureA branch from develop three days ago.
develop subsequently had commits
Hi all,
TLDR; I am seeing merge conflicts when rebasing even though applying
them to HEAD of target branch should work. Can you please upgrade my
understanding so I understand.
My understanding is that rebasing branch B onto branch A unrolls all
of branch B's commits and then reduces them onto
Am 08.09.2014 13:25, schrieb Colin Yates:
For example, let's imagine that #f1 removed fileA, some time later #d1
Assumption: #d1 is in the branch you call develop HEAD.
added a line to that file. If I was doing a merge then of course this
should be a conflict, however applying #f1 to develop
3 matches
Mail list logo
