On 30 Sep 2011, at 16:03, Sanne Grinovero wrote:
On 30 September 2011 15:50, Emmanuel Bernard
<emmanuel(a)hibernate.org> wrote:
>
> On 30 sept. 2011, at 16:46, Mircea Markus wrote:
>
> Now there's a reason why merge was used there and not rebase. If you add a
> new file in a topic branch and modify it in several commits on the same
> topic branch, then during rebase git sees all these individual commits on
> the same files as conflicts, which makes rebase a real PTA. Optimistic
> locking impl had 52 commits, most of them touching same classes.
>
> There may be something else at play here. I'm almost certain that if you add
> a new file and subsequently change it in a topic branch and afterwards
> rebase to another branch it works without conflict.
I'm pretty sure this isn't generally true. I would also suggest you would want to
squash those down to one commit.
Are you actually using rebase? Or the cherry-pick script? I think the cherry-pick could be
the problem here maybe?