latest 20 messages by marcosscriven
+
[2015-05-12T17:26:28Z]
marcosscriven
basically I don't understand why I'm getting conflicts with a cherry pick that doesn't touch the conflicting dir
+
[2015-05-12T17:26:03Z]
marcosscriven
anyone here able to check this gist to see if I've found a git issue pls? https://gist.github.com/marcosscriven/2ebef86465aa9c53ce3a#file-reproduce
+
[2015-05-11T11:53:28Z]
marcosscriven
I know I can git reset the conflicted dirs, but that's happening for every cherry pick (because the stream I'm cherry picking into still has the submodule, whereas it's been deleted from the old one)
+
[2015-05-11T11:52:17Z]
marcosscriven
Appears to be down to http://git.661346.n2.nabble.com/problem-with-cherry-picking-a-commit-which-comes-before-introducing-a-new-submodule-td5900085.html
+
[2015-05-11T11:52:07Z]
marcosscriven
Issue I'm having is: https://gist.github.com/anonymous/75d5533edb46b5dab7c1
+
[2015-05-11T11:52:01Z]
marcosscriven
does anyone here know about git cherry-pick conflicts with submodules?
+
[2014-12-28T02:16:04Z]
marcosscriven
awesome
+
[2014-12-28T02:11:50Z]
marcosscriven
ok, thanks for the comprehensive feedback :)
+
[2014-12-28T02:05:32Z]
marcosscriven
It can get a bit messy :)
+
[2014-12-28T02:05:15Z]
marcosscriven
just wondering if anyone could think of pros/cons of the various options
+
[2014-12-28T02:04:36Z]
marcosscriven
and you can call with {% include _panel.html head="Rah!" body=mybody %}
+
[2014-12-28T02:04:26Z]
marcosscriven
I made that a snippet in _includes
+
[2014-12-28T02:04:07Z]
marcosscriven
</div>
+
[2014-12-28T02:04:05Z]
marcosscriven
</div>
+
[2014-12-28T02:04:04Z]
marcosscriven
{{include.body}}
+
[2014-12-28T02:04:02Z]
marcosscriven
<div class="panel-body">
+
[2014-12-28T02:04:02Z]
marcosscriven
<div class="panel-heading">{{include.head}}</div>
+
[2014-12-28T02:04:01Z]
marcosscriven
<div class="panel panel-bordered panel-contrast mg-b">
+
[2014-12-28T02:02:47Z]
marcosscriven
http://getbootstrap.com/components/#panels-heading
+
[2014-12-28T02:00:59Z]
marcosscriven
The content of them is, yes