<html>
<head>
<style>
.sw_message P{margin:0px;padding:0px;}
.sw_message {FONT-SIZE: 12pt;FONT-FAMILY:Tahoma,Arial,Helvetica,sans-serif;background:white;}
</style>
</head>
<body class="sw_message">
<br><blockquote type="cite">--- Original message --- <br><b>Subject:</b> Re: [rekonq] Correct method to resync my clone with mainline? <br><b>From:</b> Nikhil Marathe <nsm.nikhil@gmail.com> <br><b>To:</b> <lindsay.mathieson@gmail.com> <br><b>Cc:</b> <rekonq@kde.org> <br><b>Date:</b> Monday, 17/05/2010 2:54 PM<br><br>On Mon, May 17, 2010 at 7:37 AM, <lindsay.mathieson@gmail.com> wrote:<br><blockquote type="cite"> Given my clones changes have been merged with mainline - what's the<br> correct way to bring my clone in sync with the other merges on<br> mainline? Is there a way to do it via the gitorious web interface?<br><br> What I have done is:<br><br> git pull git://gitorious.org/rekonq/mainline.git master<br> git push git@gitorious.org:~blackpaw/rekonq/blackpaws-rekonq.git<br></blockquote><br>Well since rekonq uses merge requests, what I suggest is to never<br>really make changes to master.<br><br>Always pull master with:<br> git pull --rebase origin(which is <a target="_blank" href="http://.../mainline.git%29">http://.../mainline.git)</a> master<br><br>Then<br> git checkout -b bug-fix<br><br>Hack hack hack<br><br> git push myclone ( myclone is git@gito.../blackpaws-rekonq.git ) bug-fix<br><br>Then create a merge request.<br><br>When the merge request is Merged<br><br> git checkout master<br> rebase again<br><br>If you have a long running feature branch, always rebase master, then<br>*merge* ( not rebase ) master into the feature branch.<br><br></blockquote><div><br>Thanks Nikhil, much appreciated - it took me a bit of man reading but what you layout makes a lot of sense. I'll print this one and stick it beside my monitor.<br><br> <br><br><div id="editor_signature">--<br>Lindsay Mathieson<br>http://blackpaw.jalbum.net/home/</div><br></div>
</body></html>