'Re: [Mondrian] =?windows-1252?q?Annoying_git_=22Merge_branch_=85=22_c?='

[prev in list] [next in list] [prev in thread] [next in thread] 

List:       mondrian
Subject:    Re: [Mondrian] =?windows-1252?q?Annoying_git_=22Merge_branch_=85=22_c?=
From:       Julian Hyde <jhyde () pentaho ! com>
Date:       2012-12-04 19:35:47
Message-ID: 8F4F73D5-7F71-46A8-AFA7-6FC8FF656C75 () pentaho ! com
[Download RAW message or body]

On Dec 3, 2012, at 11:07 AM, Thiyagu Palanisamy <thiyagu@thoughtworks.com<m=
ailto:thiyagu@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

[Attachment #3 (text/html)]

<html><head><meta http-equiv="Content-Type" content="text/html \
charset=windows-1252"></head><body style="word-wrap: break-word; -webkit-nbsp-mode: \
space; -webkit-line-break: after-white-space; "><div><div>On Dec 3, 2012, at 11:07 \
AM, Thiyagu Palanisamy &lt;<a \
href="mailto:thiyagu@thoughtworks.com">thiyagu@thoughtworks.com</a>&gt; \
wrote:</div><br class="Apple-interchange-newline"><blockquote type="cite"><meta \
http-equiv="Content-Type" content="text/html; charset=Windows-1252"><div>You can do : \
<b>git pull --rebase</b> instead of&nbsp;<b>git \
pull</b></div><div><br></div><div>This will pull the changes from remote and apply \
your changes on top of it, avoiding the merge.&nbsp;</div><div>

<br></div><div><a href="http://gitready.com/advanced/2009/02/11/pull-with-rebase.html" \
>http://gitready.com/advanced/2009/02/11/pull-with-rebase.html</a><br></div></blockquote><div><br></div>Great \
> advice -- thank you!</div><div><br></div><div>Julian</div><div><br></div></body></html>
> 

_______________________________________________
Mondrian mailing list
Mondrian@pentaho.org
http://lists.pentaho.org/mailman/listinfo/mondrian

--===============2518131047215813347==--

[prev in list] [next in list] [prev in thread] [next in thread] 