[rules-dev] IMPORTANT: git merges

[Ansgar Konermann]

Am 25.04.2013 15:59 schrieb "Edson Tirelli" <ed.tirelli at gmail.com>:

> Rebase enables developers to commit code on top of the most recent change
in the branch, instead of in parallel to it.

Correct.

> It guarantees no code will be lost when doing that

Plain wrong. There is no such thing as a guarantee here. Consider conflicts
during rebase. It's still a manual task to resolve these conflicts and as
such, can introduce faulty code. You still need to be very careful when
doing conflict resolution.

Don't get a false sense of security here.

> [...]
>  try to minimize merges by using rebase whenever possible.

Valuable approach nevertheless. Would recommend it, too.

Best regards

Ansgar
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.jboss.org/pipermail/rules-dev/attachments/20130425/9315095a/attachment.html