[01:38:16] <FONT COLOR="#008080">---</FONT> <font color="#616161">DominusExult is now known as Dominus</font><BR>
[08:21:00] &lt;<font color="#600060">Dominus</font>&gt; Marzo: how do I best cherry pick from https://github.com/DavidLudwig/exult-ios/commits/master ? As it is based on the iOS fork and not directly on our git.<BR>
[09:11:52] &lt;<font color="#005000">Marzo</font>&gt; That would have been one great reason for merging the iOS fork history into our main repo, because it requires pretty much the same steps<BR>
[09:13:41] &lt;<font color="#005000">Marzo</font>&gt; You basically have to get an Exult clone, add the fork as a secondary remote and pull it in, then you can cherry-pick or merge<BR>
[09:14:51] &lt;<font color="#005000">Marzo</font>&gt; Here is an example: https://gist.github.com/bhumphrey/3764983<BR>
[09:14:55] &lt;<font color="#005000">Marzo</font>&gt; The first comment is important<BR>
[09:40:38] &lt;<font color="#600060">Dominus</font>&gt; Thanks! I'll have to test that fork a bit and then later will probably add that<BR>
[09:41:42] &lt;<font color="#600060">Dominus</font>&gt; I think these are the same steps you told me back then to be able to cherry pick from Exult into the iOS fork ;)<BR>
[22:54:51] <FONT COLOR="#008080">---</FONT> <font color="#616161">DominusExult is now known as Dominus</font><BR>