I see conflicts at a time git rebasewhen I do not expect this. I have
* - A master
\
B - C - D - E release
Now i do
% git checkout release
% get rebase master release
[...]
CONFLICT (content): Merge conflict in webserver/app/api/model/Move.scala
Failed to merge in the changes.
Patch failed at 0015 work in progress
[...]
but since it releasewas forked masterand already has everything that it does (namely commit A, why does it refuse to falsify at all?) I would not expect the branch releaseto change at all.
What part am I missing here?
source
share