{"prev":"https:\/\/www.commitstrip.com\/2012\/09\/03\/best-of-les-codeurs-au-cinema-avatar\/?_as_view=1","next":"https:\/\/www.commitstrip.com\/2012\/09\/05\/php-sql-asp-perl-ruby-java-etc\/?_as_view=1","current":"https:\/\/www.commitstrip.com\/2012\/09\/04\/commit-conflict\/?_as_view=1","content":"\t\t\t\t\t\t\n\t\t\t\t\t\t\t<nav class=\"nav-fixed\">\n\t\t\t\t\t\t\t\t<span class=\"nav-previous\"><a href=\"https:\/\/www.commitstrip.com\/2012\/09\/03\/best-of-les-codeurs-au-cinema-avatar\/\" rel=\"prev\"><i class=\"fa fa-chevron-left\"><\/i><\/a><\/span>\n\t\t\t\t\t\t\t\t<span class=\"nav-next\"><a href=\"https:\/\/www.commitstrip.com\/2012\/09\/05\/php-sql-asp-perl-ruby-java-etc\/\" rel=\"next\"><i class=\"fa fa-chevron-right\"><\/i><\/a><\/span>\n\t\t\t\t\t\t\t<\/nav><!-- #nav-single -->\n\n\t\t\t\t\t\t\t<article id=\"post-765\" class=\"post-765 post type-post status-publish format-standard has-post-thumbnail hentry category-coder tag-commit tag-conflict tag-fight tag-irl tag-ninja\">\r\n\t<header class=\"entry-header\">\r\n\t\t<h1 class=\"entry-title\">[Best Of] Commit conflict<\/h1>\r\n\r\n\t\t\t\t<div class=\"entry-meta\">\r\n\t\t\t<span class=\"sep\"><\/span><a href=\"https:\/\/www.commitstrip.com\/2012\/09\/04\/commit-conflict\/\" title=\"09:05 PM\" rel=\"bookmark\"><time class=\"entry-date\" datetime=\"2012-09-04T21:05:36+00:00\" pubdate>Tuesday September  4th, 2012<\/time><\/a><\/span>\t\t<\/div><!-- .entry-meta -->\r\n\t\t\t<\/header><!-- .entry-header -->\r\n\r\n\t<div class=\"entry-content\">\r\n\t\t<p><b>First publication: 12 march 2012<\/b><\/p>\n<p><img class=\"alignnone size-full wp-image-807\" title=\"Strip-commit-IRL-(800-final)\" src=\"https:\/\/www.commitstrip.com\/wp-content\/uploads\/2012\/03\/Strip-commit-IRL-800-final6.jpg\" alt=\"\" width=\"800\" height=\"1597\" \/><\/p>\n\t\t\t<\/div><!-- .entry-content -->\r\n\r\n\t<!-- <footer class=\"entry-meta\">\r\n\t\t\t\t\r\n\t\t\t\t<div id=\"author-info\">\r\n\t\t\t<div id=\"author-avatar\">\r\n\t\t\t\t\t\t\t<\/div><!-- #author-avatar -->\r\n\t\t\t<!-- <div id=\"author-description\">\r\n\t\t\t\t<h2><\/h2>\r\n\t\t\t\t\t\t\t\t<div id=\"author-link\">\r\n\t\t\t\t\t<a href=\"\" rel=\"author\">\r\n\t\t\t\t\t\t\t\t\t\t\t<\/a>\r\n\t\t\t\t<\/div> <!-- #author-link\t\r\n\t\t\t<\/div> <!-- #author-description \r\n\t\t<\/div> <!-- #entry-author-info \r\n\t\t\t<\/footer> --> <!-- .entry-meta -->\r\n<\/article><!-- #post-765 -->\r\n\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t<div class=\"socialButtons\">\n\t\t\t\t\t\t\t\t<a href=\"\/\/twitter.com\/share\" class=\"twitter-share-button\" data-url=\"https:\/\/www.commitstrip.com\/2012\/09\/04\/commit-conflict\/\" \n\t\t\t\t\t\t\tdata-text=\"[Best Of] Commit conflict\" data-lang=\"en\"><\/a>\t\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t<div class=\"likeWrap\"><fb:like layout=\"button_count\" send=\"false\" width=\"450\" show-faces=\"false\" href=\"https:\/\/www.commitstrip.com\/2012\/09\/04\/commit-conflict\/\"><\/fb:like><\/div>\n\t\t\t\t\t\t\t\t<div class=\"gplus\"><g:plusone size=\"medium\" href=\"https:\/\/www.commitstrip.com\/2012\/09\/04\/commit-conflict\/\"><\/g:plusone><\/div>\n\n\t\t\t\t\t\t\t<\/div>\n\n\t\t\t\t\t\t\t<nav class=\"nav-single\">\n\n\t\t\t\t\t\t\t\t<span class=\"nav-previous\"><a href=\"https:\/\/www.commitstrip.com\/2012\/09\/03\/best-of-les-codeurs-au-cinema-avatar\/\" rel=\"prev\"><span class=\"meta-nav\">&larr;<\/span> Previous<\/a><\/span>\n\t\t\t\t\t\t\t\t<span ><a href=\"\/?random=1\">Random<\/a><\/span>\n\t\t\t\t\t\t\t\t<span class=\"nav-next\"><a href=\"https:\/\/www.commitstrip.com\/2012\/09\/05\/php-sql-asp-perl-ruby-java-etc\/\" rel=\"next\">Next <span class=\"meta-nav\">&rarr;<\/span><\/a><\/span>\n\t\t\t\t\t\t\t<\/nav><!-- #nav-single -->\n\n\t\t\t\t\t\t\t<!-- Newsletter -->\n\t\t\t\t\t\t\t<div class=\"cm_newsletter cm_newsletter_en\">\r\n\t\t\t\t\t\t<p>\r\n\t\t\t\t\t\t\tEvery sunday, receive not only the 5 strips of the week, but also our selection of videos, \r\n\t\t\tanimated gifs and articles, which we found fun and you will also probably like!\r\n\t\t\t\t\t\t<\/p>\r\n\t\t\t\t\t\t<p id=\"sample\">\r\n\t\t\t\t\t\t\t<a href=\"#\" onclick=\"Newsletter.preview(); return false;\">What does it look like?<\/a>\r\n\t\t\t\t\t\t<\/p>\r\n\t\t\t\t\t\t<p id=\"youlikeit\" style=\"display:none\">\r\n\t\t\t\t\t\t\t<strong>You like it? Subscribe now!<\/strong>\r\n\t\t\t\t\t\t<\/p>\r\n\t\t\t\t\t\t<form onsubmit=\"return Newsletter.check();\" action=\"http:\/\/krdsagency.createsend.com\/t\/r\/s\/jklrjhu\/\" method=\"post\" id=\"subForm\">\r\n\t\t\t\t\t\t\t<div>\r\n\t\t\t\t\t\t\t\t<input type=\"text\" name=\"cm-name\" id=\"name\" placeholder=\"Your name\" \/>\r\n\t\t\t\t\t\t\t\t<input type=\"text\" name=\"cm-jklrjhu-jklrjhu\" id=\"jklrjhu-jklrjhu\"  placeholder=\"Your email\" \/>\r\n\t\t\t\t\t\t\t\t<select name=\"cm-fo-ykutdtj\">\r\n\t\t\t\t\t\t\t\t\t<option value=\"3922351\" selected=\"selected\">EN - English<\/option>\r\n\t\t\t\t\t\t\t\t\t<option value=\"3922352\" >FR - Fran\u00e7ais<\/option>\r\n\t\t\t\t\t\t\t\t<\/select>\r\n\t\t\t\t\t\t\t\t<input type=\"submit\" value=\"I subscribe\" \/>\r\n\t\t\t\t\t\t\t<\/div>\r\n\t\t\t\t\t\t<\/form>\r\n\t\t\t\t\t\t<span class=\"disclaimer\">Your email will only be used to send you the newsletter.<\/span>\r\n\t\t\t\t\t<\/div>\n\t\t\t\t\t\t\t<div class=\"fbCommentsBlock\">\n\t\t\t\t\t\t\t\t<fb:comments href=\"https:\/\/www.commitstrip.com\/2012\/09\/04\/commit-conflict\/\" num_posts=\"5\" width=\"570\">\n\t\t\t\t\t\t\t\t<\/fb:comments>\n\t\t\t\t\t\t\t<\/div>\n\n\t\t\t\t\t\t\t<div class=\"post-footer-link\">\n\t\t\t\t\t\t\t\t<a href=\"https:\/\/www.commitstrip.com\">Go to Home<\/a>\n\t\t\t\t\t\t\t<\/div>\n\t\t\t\t\t\t"}