[Mondrian] Annoying git "Merge branch …" commits

[Julian Hyde]

On Dec 3, 2012, at 11:07 AM, Thiyagu Palanisamy <thiyagu at thoughtworks.com<mailto:thiyagu at thoughtworks.com>> wrote:

You can do : git pull --rebase instead of git pull

This will pull the changes from remote and apply your changes on top of it, avoiding the merge.

http://gitready.com/advanced/2009/02/11/pull-with-rebase.html

Great advice -- thank you!

Julian

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.pentaho.org/pipermail/mondrian/attachments/20121204/dda2ed61/attachment.html