<div dir="ltr"><div>Use git rebase (which is equivalent to cherry-picking each individual commit), like "git rebase master featurebranch" to rebase onto master (or onto svn/wip instead).<br></div><div>Or you can skip that entirely and just git checkout featurebranch and then do "git svn dcommit". (Note that this does a rebase automatically)<br></div><div><br></div>I guess you could revert this squashed commit and then rebase the commits properly to keep the full history. At least, I think that won't cause conflicts when rebasing.<br><br><br><div class="gmail_extra"><br><div class="gmail_quote">On 25 July 2017 at 09:02, James Paige <span dir="ltr"><<a href="mailto:Bob@hamsterrepublic.com" target="_blank">Bob@hamsterrepublic.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr">Ah, well I can see that I didn't merge that branch in the correct way. Looks like it works fine, I just lost my git commit messages. I am thinking I should have done something with cherry-pick rather than just merging the branch (?)<br><br>For posterity, here are the commit messages:<br><br>commit 91c3f59e82157bb6a473bc28b48d18<wbr>a75ac222af<br>Author: Bob the Hamster <Bob@HamsterRepublic.com><br>Date: Sun Jul 16 14:32:46 2017 -0700<br><br> Add NPCType.pathfinding_obstructio<wbr>n_mode and support for editing it in the NPC Editor.<br> (only visible when movement type is "Chase You (Pathfinding)")<br><br>commit 145f08141682b35d0a0c88609e9a01<wbr>121ce6a492<br>Author: Bob the Hamster <Bob@HamsterRepublic.com><br>Date: Wed Jul 19 21:04:46 2017 -0700<br><br> Add a per-map default for NPC pathfinding rules<br> Update the per-NPC option to support the default<br> (this is just the editor implementation, these are not respected in-game yet)<br><br><br>commit 537311118a9aae286156dcf4f49ef7<wbr>01241b2659<br>Author: Bob the Hamster <Bob@HamsterRepublic.com><br>Date: Wed Jul 19 21:12:28 2017 -0700<br><br> Add a scrollbar to the General Map Data editor screen<br><br><br>commit d09bf3eb0a8b481cb1bf6b5978e81c<wbr>76414065cb<br>Author: Bob the Hamster <Bob@HamsterRepublic.com><br>Date: Mon Jul 24 13:51:09 2017 -0700<br><br> Add support for changing the NPCs pathfinding collision rule with other NPCs<br> Add a test map to a-star.rpg with Cyan slimes who follow the "Ignore NPCs" rule<br> <br> Also add a workaround for a bug where NPCCollisionCache.populate() was crashing<br> with an out-of-bounds error. I think this is a wrapping map bug. The case is<br> not fixed yet, it just writes a debug message rather than crashing<br><br></div><div class="m_-8835163235739155129m_-1919854250791712326HOEnZb"><div class="m_-8835163235739155129m_-1919854250791712326h5"><div class="gmail_extra"><br><div class="gmail_quote">On Mon, Jul 24, 2017 at 1:56 PM, <span dir="ltr"><<a href="mailto:subversion@hamsterrepublic.com" target="_blank">subversion@hamsterrepublic.co<wbr>m</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">james<br>
2017-07-24 13:56:03 -0700 (Mon, 24 Jul 2017)<br>
60<br>
Merge branch 'FEATURE_pathfinding_obstructi<wbr>on_mode' into wip<br>
---<br>
U wip/common.rbas<br>
U wip/game.bas<br>
U wip/loading.rbas<br>
U wip/mapsubs.bas<br>
U wip/pathfinding.bas<br>
U wip/<a href="http://pathfinding.bi" rel="noreferrer" target="_blank">pathfinding.bi</a><br>
U wip/testgame/a-star.hss<br>
U wip/testgame/a-star.rpg<br>
U wip/<a href="http://udts.bi" rel="noreferrer" target="_blank">udts.bi</a><br>
______________________________<wbr>_________________<br>
Ohrrpgce mailing list<br>
<a href="mailto:ohrrpgce@lists.motherhamster.org" target="_blank">ohrrpgce@lists.motherhamster.o<wbr>rg</a><br>
<a href="http://lists.motherhamster.org/listinfo.cgi/ohrrpgce-motherhamster.org" rel="noreferrer" target="_blank">http://lists.motherhamster.org<wbr>/listinfo.cgi/ohrrpgce-motherh<wbr>amster.org</a><br>
</blockquote></div><br></div>
</div></div><br>______________________________<wbr>_________________<br>
Ohrrpgce mailing list<br>
<a href="mailto:ohrrpgce@lists.motherhamster.org" target="_blank">ohrrpgce@lists.motherhamster.o<wbr>rg</a><br>
<a href="http://lists.motherhamster.org/listinfo.cgi/ohrrpgce-motherhamster.org" rel="noreferrer" target="_blank">http://lists.motherhamster.org<wbr>/listinfo.cgi/ohrrpgce-motherh<wbr>amster.org</a><br>
<br></blockquote></div><br></div></div>