<html><head></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space; ">Yeah essentially, here is what happened, Galder:<div><br></div><div>1) Upstream was at a7b639a, as were everyones' forks</div><div>2) Work was done resulting in commits f804d87, 38a2b81, 6221342 and 31addcd</div><div>3) These commits were pulled in to upstream</div><div>4) You then worked on commit 2922faf in your own topic branch</div><div>5) Pulling the topic branch into upstream involved a merge, since your topic branch was still based off a7b639a while upstream/master was now on 31addcd</div><div><br></div><div>David is right, the approach to prevent (or minimise, anyway) the need for a merge on upstream is that you sync with upstream _before_ you issue your pull request, so that your topic branch knows about the latest goings-on in upstream.</div><div><br></div><div>Here is how you can do this:</div><div><br></div><div>1) Run the sync_with_upstream.sh script that I wrote. This will make sure your master and 4.2.x branches are up to date.</div><div>2) Sync your topic branches by doing: </div><div><br></div><div><span class="Apple-tab-span" style="white-space:pre"> </span>git checkout topic_master && git rebase master</div><div><span class="Apple-tab-span" style="white-space:pre"> </span>git checkout topic_4.2.x && git rebase 4.2.x (if you have a 4.2.x version of your topic)</div><div><br></div><div>3) Push your topic branches (using the -f flag, since you rebased!) to your remote repo.</div><div><br></div><div>I've mentioned this in the worked example on the wiki:</div><div><br></div><div><a href="http://community.jboss.org/wiki/InfinispanandGitHub#A_worked_example">http://community.jboss.org/wiki/InfinispanandGitHub#A_worked_example</a></div><div><br></div><div>Cheers</div><div>Manik</div><div><br></div><div><br></div><div><div><div>On 11 Nov 2010, at 19:41, David M. Lloyd wrote:</div><br class="Apple-interchange-newline"><blockquote type="cite"><div>On 11/11/2010 01:27 PM, Galder Zamarreņo wrote:<br><blockquote type="cite">The merge messages appearing in <a href="https://github.com/infinispan/infinispan/commits/master">https://github.com/infinispan/infinispan/commits/master</a> are a bit noisy, aren't they?<br></blockquote><br>To avoid that, people working in branches should use "git rebase" or <br>"git pull --rebase" to bring in upstream changes, NOT "git merge" or <br>"git pull" (sans --rebase).<br><br>Not only are merge messages noisy but they can make it very hard to <br>figure out the history of a change.<br>-- <br>- DML<br>_______________________________________________<br>infinispan-dev mailing list<br><a href="mailto:infinispan-dev@lists.jboss.org">infinispan-dev@lists.jboss.org</a><br>https://lists.jboss.org/mailman/listinfo/infinispan-dev<br></div></blockquote></div><br><div>
<span class="Apple-style-span" style="font-size: 12px; "><div style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space; "><div>--</div><div>Manik Surtani</div><div><a href="mailto:manik@jboss.org">manik@jboss.org</a></div><div>Lead, Infinispan</div><div>Lead, JBoss Cache</div><div><a href="http://www.infinispan.org">http://www.infinispan.org</a></div><div><a href="http://www.jbosscache.org">http://www.jbosscache.org</a></div><div><br></div></div></span><br class="Apple-interchange-newline"><br class="Apple-interchange-newline">
</div>
<br></div></body></html>