!function e(t,o,n){function a(r,s){if(!o[r]){if(!t[r]){var c="function"==typeof require&&require;if(!s&&c)return c(r,!0);if(i)return i(r,!0);var m=new Error("Cannot find module '"+r+"'");throw m.code="MODULE_NOT_FOUND",m}var l=o[r]={exports:{}};t[r][0].call(l.exports,(function(e){return a(t[r][1][e]||e)}),l,l.exports,e,t,o,n)}return o[r].exports}for(var i="function"==typeof require&&require,r=0;r<n.length;r++)a(n[r]);return a}({1:[function(e,t,o){(function(t){!function(n){var a="object"==typeof self&&self.self===self&&self||"object"==typeof t&&t.global===t&&t;if("function"==typeof define&&define.amd)define(["underscore","jquery","exports"],(function(e,t,o){a.Backbone=n(a,o,e,t)}));else if(void 0!==o){var i,r=e("underscore");try{i=e("jquery")}catch(e){}n(a,o,r,i)}else a.Backbone=n(a,{},a._,a.jQuery||a.Zepto||a.ender||a.$)}((function(e,t,o,n){var a=e.Backbone,i=Array.prototype.slice;t.VERSION="1.4.0",t.$=n,t.noConflict=function(){return e.Backbone=a,this},t.emulateHTTP=!1,t.emulateJSON=!1;var r,s=t.Events={},c=/\s+/,m=function(e,t,n,a,i){var r,s=0;if(n&&"object"==typeof n){void 0!==a&&"context"in i&&void 0===i.context&&(i.context=a);for(r=o.keys(n);s<r.length;s++)t=m(e,t,r[s],n[r[s]],i)}else if(n&&c.test(n))for(r=n.split(c);s<r.length;s++)t=e(t,r[s],a,i);else t=e(t,n,a,i);return t};s.on=function(e,t,o){(this._events=m(l,this._events||{},e,t,{context:o,ctx:this,listening:r}),r)&&((this._listeners||(this._listeners={}))[r.id]=r,r.interop=!1);return this},s.listenTo=function(e,t,n){if(!e)return this;var a=e._listenId||(e._listenId=o.uniqueId("l")),i=this._listeningTo||(this._listeningTo={}),s=r=i[a];s||(this._listenId||(this._listenId=o.uniqueId("l")),s=r=i[a]=new f(this,e));var c=u(e,t,n,this);if(r=void 0,c)throw c;return s.interop&&s.on(t,n),this};var l=function(e,t,o,n){if(o){var a=e[t]||(e[t]=[]),i=n.context,r=n.ctx,s=n.listening;s&&s.count++,a.push({callback:o,context:i,ctx:i||r,listening:s})}return e},u=function(e,t,o,n){try{e.on(t,o,n)}catch(e){return e}};s.off=function(e,t,o){return this._events?(this._events=m(d,this._events,e,t,{context:o,listeners:this._listeners}),this):this},s.stopListening=function(e,t,n){var a=this._listeningTo;if(!a)return this;for(var i=e?[e._listenId]:o.keys(a),r=0;r<i.length;r++){var s=a[i[r]];if(!s)break;s.obj.off(t,n,this),s.interop&&s.off(t,n)}return o.isEmpty(a)&&(this._listeningTo=void 0),this};var d=function(e,t,n,a){if(e){var i,r=a.context,s=a.listeners,c=0;if(t||r||n){for(i=t?[t]:o.keys(e);c<i.length;c++){var m=e[t=i[c]];if(!m)break;for(var l=[],u=0;u<m.length;u++){var d=m[u];if(n&&n!==d.callback&&n!==d.callback._callback||r&&r!==d.context)l.push(d);else{var h=d.listening;h&&h.off(t,n)}}l.length?e[t]=l:delete e[t]}return e}for(i=o.keys(s);c<i.length;c++)s[i[c]].cleanup()}};s.once=function(e,t,o){var n=m(h,{},e,t,this.off.bind(this));return"string"==typeof e&&null==o&&(t=void 0),this.on(n,t,o)},s.listenToOnce=function(e,t,o){var n=m(h,{},t,o,this.stopListening.bind(this,e));return this.listenTo(e,n)};var h=function(e,t,n,a){if(n){var i=e[t]=o.once((function(){a(t,i),n.apply(this,arguments)}));i._callback=n}return e};s.trigger=function(e){if(!this._events)return this;for(var t=Math.max(0,arguments.length-1),o=Array(t),n=0;n<t;n++)o[n]=arguments[n+1];return m(p,this._events,e,void 0,o),this};var p=function(e,t,o,n){if(e){var a=e[t],i=e.all;a&&i&&(i=i.slice()),a&&g(a,n),i&&g(i,[t].concat(n))}return e},g=function(e,t){var o,n=-1,a=e.length,i=t[0],r=t[1],s=t[2];switch(t.length){case 0:for(;++n<a;)(o=e[n]).callback.call(o.ctx);return;case 1:for(;++n<a;)(o=e[n]).callback.call(o.ctx,i);return;case 2:for(;++n<a;)(o=e[n]).callback.call(o.ctx,i,r);return;case 3:for(;++n<a;)(o=e[n]).callback.call(o.ctx,i,r,s);return;default:for(;++n<a;)(o=e[n]).callback.apply(o.ctx,t);return}},f=function(e,t){this.id=e._listenId,this.listener=e,this.obj=t,this.interop=!0,this.count=0,this._events=void 0};f.prototype.on=s.on,f.prototype.off=function(e,t){var o;this.interop?(this._events=m(d,this._events,e,t,{context:void 0,listeners:void 0}),o=!this._events):(this.count--,o=0===this.count),o&&this.cleanup()},f.prototype.cleanup=function(){delete this.listener._listeningTo[this.obj._listenId],this.interop||delete this.obj._listeners[this.id]},s.bind=s.on,s.unbind=s.off,o.extend(t,s);var b=t.Model=function(e,t){var n=e||{};t||(t={}),this.preinitialize.apply(this,arguments),this.cid=o.uniqueId(this.cidPrefix),this.attributes={},t.collection&&(this.collection=t.collection),t.parse&&(n=this.parse(n,t)||{});var a=o.result(this,"defaults");n=o.defaults(o.extend({},a,n),a),this.set(n,t),this.changed={},this.initialize.apply(this,arguments)};o.extend(b.prototype,s,{changed:null,validationError:null,idAttribute:"id",cidPrefix:"c",preinitialize:function(){},initialize:function(){},toJSON:function(e){return o.clone(this.attributes)},sync:function(){return t.sync.apply(this,arguments)},get:function(e){return this.attributes[e]},escape:function(e){return o.escape(this.get(e))},has:function(e){return null!=this.get(e)},matches:function(e){return!!o.iteratee(e,this)(this.attributes)},set:function(e,t,n){if(null==e)return this;var a;if("object"==typeof e?(a=e,n=t):(a={})[e]=t,n||(n={}),!this._validate(a,n))return!1;var i=n.unset,r=n.silent,s=[],c=this._changing;this._changing=!0,c||(this._previousAttributes=o.clone(this.attributes),this.changed={});var m=this.attributes,l=this.changed,u=this._previousAttributes;for(var d in a)t=a[d],o.isEqual(m[d],t)||s.push(d),o.isEqual(u[d],t)?delete l[d]:l[d]=t,i?delete m[d]:m[d]=t;if(this.idAttribute in a&&(this.id=this.get(this.idAttribute)),!r){s.length&&(this._pending=n);for(var h=0;h<s.length;h++)this.trigger("change:"+s[h],this,m[s[h]],n)}if(c)return this;if(!r)for(;this._pending;)n=this._pending,this._pending=!1,this.trigger("change",this,n);return this._pending=!1,this._changing=!1,this},unset:function(e,t){return this.set(e,void 0,o.extend({},t,{unset:!0}))},clear:function(e){var t={};for(var n in this.attributes)t[n]=void 0;return this.set(t,o.extend({},e,{unset:!0}))},hasChanged:function(e){return null==e?!o.isEmpty(this.changed):o.has(this.changed,e)},changedAttributes:function(e){if(!e)return!!this.hasChanged()&&o.clone(this.changed);var t,n=this._changing?this._previousAttributes:this.attributes,a={};for(var i in e){var r=e[i];o.isEqual(n[i],r)||(a[i]=r,t=!0)}return!!t&&a},previous:function(e){return null!=e&&this._previousAttributes?this._previousAttributes[e]:null},previousAttributes:function(){return o.clone(this._previousAttributes)},fetch:function(e){e=o.extend({parse:!0},e);var t=this,n=e.success;return e.success=function(o){var a=e.parse?t.parse(o,e):o;if(!t.set(a,e))return!1;n&&n.call(e.context,t,o,e),t.trigger("sync",t,o,e)},L(this,e),this.sync("read",this,e)},save:function(e,t,n){var a;null==e||"object"==typeof e?(a=e,n=t):(a={})[e]=t;var i=(n=o.extend({validate:!0,parse:!0},n)).wait;if(a&&!i){if(!this.set(a,n))return!1}else if(!this._validate(a,n))return!1;var r=this,s=n.success,c=this.attributes;n.success=function(e){r.attributes=c;var t=n.parse?r.parse(e,n):e;if(i&&(t=o.extend({},a,t)),t&&!r.set(t,n))return!1;s&&s.call(n.context,r,e,n),r.trigger("sync",r,e,n)},L(this,n),a&&i&&(this.attributes=o.extend({},c,a));var m=this.isNew()?"create":n.patch?"patch":"update";"patch"!==m||n.attrs||(n.attrs=a);var l=this.sync(m,this,n);return this.attributes=c,l},destroy:function(e){e=e?o.clone(e):{};var t=this,n=e.success,a=e.wait,i=function(){t.stopListening(),t.trigger("destroy",t,t.collection,e)};e.success=function(o){a&&i(),n&&n.call(e.context,t,o,e),t.isNew()||t.trigger("sync",t,o,e)};var r=!1;return this.isNew()?o.defer(e.success):(L(this,e),r=this.sync("delete",this,e)),a||i(),r},url:function(){var e=o.result(this,"urlRoot")||o.result(this.collection,"url")||O();if(this.isNew())return e;var t=this.get(this.idAttribute);return e.replace(/[^\/]$/,"$&/")+encodeURIComponent(t)},parse:function(e,t){return e},clone:function(){return new this.constructor(this.attributes)},isNew:function(){return!this.has(this.idAttribute)},isValid:function(e){return this._validate({},o.extend({},e,{validate:!0}))},_validate:function(e,t){if(!t.validate||!this.validate)return!0;e=o.extend({},this.attributes,e);var n=this.validationError=this.validate(e,t)||null;return!n||(this.trigger("invalid",this,n,o.extend(t,{validationError:n})),!1)}});var v=t.Collection=function(e,t){t||(t={}),this.preinitialize.apply(this,arguments),t.model&&(this.model=t.model),void 0!==t.comparator&&(this.comparator=t.comparator),this._reset(),this.initialize.apply(this,arguments),e&&this.reset(e,o.extend({silent:!0},t))},w={add:!0,remove:!0,merge:!0},y={add:!0,remove:!1},k=function(e,t,o){o=Math.min(Math.max(o,0),e.length);var n,a=Array(e.length-o),i=t.length;for(n=0;n<a.length;n++)a[n]=e[n+o];for(n=0;n<i;n++)e[n+o]=t[n];for(n=0;n<a.length;n++)e[n+i+o]=a[n]};o.extend(v.prototype,s,{model:b,preinitialize:function(){},initialize:function(){},toJSON:function(e){return this.map((function(t){return t.toJSON(e)}))},sync:function(){return t.sync.apply(this,arguments)},add:function(e,t){return this.set(e,o.extend({merge:!1},t,y))},remove:function(e,t){t=o.extend({},t);var n=!o.isArray(e);e=n?[e]:e.slice();var a=this._removeModels(e,t);return!t.silent&&a.length&&(t.changes={added:[],merged:[],removed:a},this.trigger("update",this,t)),n?a[0]:a},set:function(e,t){if(null!=e){(t=o.extend({},w,t)).parse&&!this._isModel(e)&&(e=this.parse(e,t)||[]);var n=!o.isArray(e);e=n?[e]:e.slice();var a=t.at;null!=a&&(a=+a),a>this.length&&(a=this.length),a<0&&(a+=this.length+1);var i,r,s=[],c=[],m=[],l=[],u={},d=t.add,h=t.merge,p=t.remove,g=!1,f=this.comparator&&null==a&&!1!==t.sort,b=o.isString(this.comparator)?this.comparator:null;for(r=0;r<e.length;r++){i=e[r];var v=this.get(i);if(v){if(h&&i!==v){var y=this._isModel(i)?i.attributes:i;t.parse&&(y=v.parse(y,t)),v.set(y,t),m.push(v),f&&!g&&(g=v.hasChanged(b))}u[v.cid]||(u[v.cid]=!0,s.push(v)),e[r]=v}else d&&(i=e[r]=this._prepareModel(i,t))&&(c.push(i),this._addReference(i,t),u[i.cid]=!0,s.push(i))}if(p){for(r=0;r<this.length;r++)u[(i=this.models[r]).cid]||l.push(i);l.length&&this._removeModels(l,t)}var C=!1,A=!f&&d&&p;if(s.length&&A?(C=this.length!==s.length||o.some(this.models,(function(e,t){return e!==s[t]})),this.models.length=0,k(this.models,s,0),this.length=this.models.length):c.length&&(f&&(g=!0),k(this.models,c,null==a?this.length:a),this.length=this.models.length),g&&this.sort({silent:!0}),!t.silent){for(r=0;r<c.length;r++)null!=a&&(t.index=a+r),(i=c[r]).trigger("add",i,this,t);(g||C)&&this.trigger("sort",this,t),(c.length||l.length||m.length)&&(t.changes={added:c,removed:l,merged:m},this.trigger("update",this,t))}return n?e[0]:e}},reset:function(e,t){t=t?o.clone(t):{};for(var n=0;n<this.models.length;n++)this._removeReference(this.models[n],t);return t.previousModels=this.models,this._reset(),e=this.add(e,o.extend({silent:!0},t)),t.silent||this.trigger("reset",this,t),e},push:function(e,t){return this.add(e,o.extend({at:this.length},t))},pop:function(e){var t=this.at(this.length-1);return this.remove(t,e)},unshift:function(e,t){return this.add(e,o.extend({at:0},t))},shift:function(e){var t=this.at(0);return this.remove(t,e)},slice:function(){return i.apply(this.models,arguments)},get:function(e){if(null!=e)return this._byId[e]||this._byId[this.modelId(this._isModel(e)?e.attributes:e)]||e.cid&&this._byId[e.cid]},has:function(e){return null!=this.get(e)},at:function(e){return e<0&&(e+=this.length),this.models[e]},where:function(e,t){return this[t?"find":"filter"](e)},findWhere:function(e){return this.where(e,!0)},sort:function(e){var t=this.comparator;if(!t)throw new Error("Cannot sort a set without a comparator");e||(e={});var n=t.length;return o.isFunction(t)&&(t=t.bind(this)),1===n||o.isString(t)?this.models=this.sortBy(t):this.models.sort(t),e.silent||this.trigger("sort",this,e),this},pluck:function(e){return this.map(e+"")},fetch:function(e){var t=(e=o.extend({parse:!0},e)).success,n=this;return e.success=function(o){var a=e.reset?"reset":"set";n[a](o,e),t&&t.call(e.context,n,o,e),n.trigger("sync",n,o,e)},L(this,e),this.sync("read",this,e)},create:function(e,t){var n=(t=t?o.clone(t):{}).wait;if(!(e=this._prepareModel(e,t)))return!1;n||this.add(e,t);var a=this,i=t.success;return t.success=function(e,t,o){n&&a.add(e,o),i&&i.call(o.context,e,t,o)},e.save(null,t),e},parse:function(e,t){return e},clone:function(){return new this.constructor(this.models,{model:this.model,comparator:this.comparator})},modelId:function(e){return e[this.model.prototype.idAttribute||"id"]},values:function(){return new A(this,x)},keys:function(){return new A(this,M)},entries:function(){return new A(this,_)},_reset:function(){this.length=0,this.models=[],this._byId={}},_prepareModel:function(e,t){if(this._isModel(e))return e.collection||(e.collection=this),e;(t=t?o.clone(t):{}).collection=this;var n=new this.model(e,t);return n.validationError?(this.trigger("invalid",this,n.validationError,t),!1):n},_removeModels:function(e,t){for(var o=[],n=0;n<e.length;n++){var a=this.get(e[n]);if(a){var i=this.indexOf(a);this.models.splice(i,1),this.length--,delete this._byId[a.cid];var r=this.modelId(a.attributes);null!=r&&delete this._byId[r],t.silent||(t.index=i,a.trigger("remove",a,this,t)),o.push(a),this._removeReference(a,t)}}return o},_isModel:function(e){return e instanceof b},_addReference:function(e,t){this._byId[e.cid]=e;var o=this.modelId(e.attributes);null!=o&&(this._byId[o]=e),e.on("all",this._onModelEvent,this)},_removeReference:function(e,t){delete this._byId[e.cid];var o=this.modelId(e.attributes);null!=o&&delete this._byId[o],this===e.collection&&delete e.collection,e.off("all",this._onModelEvent,this)},_onModelEvent:function(e,t,o,n){if(t){if(("add"===e||"remove"===e)&&o!==this)return;if("destroy"===e&&this.remove(t,n),"change"===e){var a=this.modelId(t.previousAttributes()),i=this.modelId(t.attributes);a!==i&&(null!=a&&delete this._byId[a],null!=i&&(this._byId[i]=t))}}this.trigger.apply(this,arguments)}});var C="function"==typeof Symbol&&Symbol.iterator;C&&(v.prototype[C]=v.prototype.values);var A=function(e,t){this._collection=e,this._kind=t,this._index=0},x=1,M=2,_=3;C&&(A.prototype[C]=function(){return this}),A.prototype.next=function(){if(this._collection){if(this._index<this._collection.length){var e,t=this._collection.at(this._index);if(this._index++,this._kind===x)e=t;else{var o=this._collection.modelId(t.attributes);e=this._kind===M?o:[o,t]}return{value:e,done:!1}}this._collection=void 0}return{value:void 0,done:!0}};var D=t.View=function(e){this.cid=o.uniqueId("view"),this.preinitialize.apply(this,arguments),o.extend(this,o.pick(e,T)),this._ensureElement(),this.initialize.apply(this,arguments)},E=/^(\S+)\s*(.*)$/,T=["model","collection","el","id","attributes","className","tagName","events"];o.extend(D.prototype,s,{tagName:"div",$:function(e){return this.$el.find(e)},preinitialize:function(){},initialize:function(){},render:function(){return this},remove:function(){return this._removeElement(),this.stopListening(),this},_removeElement:function(){this.$el.remove()},setElement:function(e){return this.undelegateEvents(),this._setElement(e),this.delegateEvents(),this},_setElement:function(e){this.$el=e instanceof t.$?e:t.$(e),this.el=this.$el[0]},delegateEvents:function(e){if(e||(e=o.result(this,"events")),!e)return this;for(var t in this.undelegateEvents(),e){var n=e[t];if(o.isFunction(n)||(n=this[n]),n){var a=t.match(E);this.delegate(a[1],a[2],n.bind(this))}}return this},delegate:function(e,t,o){return this.$el.on(e+".delegateEvents"+this.cid,t,o),this},undelegateEvents:function(){return this.$el&&this.$el.off(".delegateEvents"+this.cid),this},undelegate:function(e,t,o){return this.$el.off(e+".delegateEvents"+this.cid,t,o),this},_createElement:function(e){return document.createElement(e)},_ensureElement:function(){if(this.el)this.setElement(o.result(this,"el"));else{var e=o.extend({},o.result(this,"attributes"));this.id&&(e.id=o.result(this,"id")),this.className&&(e.class=o.result(this,"className")),this.setElement(this._createElement(o.result(this,"tagName"))),this._setAttributes(e)}},_setAttributes:function(e){this.$el.attr(e)}});var q=function(e,t,n,a){o.each(n,(function(o,n){t[n]&&(e.prototype[n]=function(e,t,o,n){switch(t){case 1:return function(){return e[o](this[n])};case 2:return function(t){return e[o](this[n],t)};case 3:return function(t,a){return e[o](this[n],S(t,this),a)};case 4:return function(t,a,i){return e[o](this[n],S(t,this),a,i)};default:return function(){var t=i.call(arguments);return t.unshift(this[n]),e[o].apply(e,t)}}}(t,o,n,a))}))},S=function(e,t){return o.isFunction(e)?e:o.isObject(e)&&!t._isModel(e)?z(e):o.isString(e)?function(t){return t.get(e)}:e},z=function(e){var t=o.matches(e);return function(e){return t(e.attributes)}};o.each([[v,{forEach:3,each:3,map:3,collect:3,reduce:0,foldl:0,inject:0,reduceRight:0,foldr:0,find:3,detect:3,filter:3,select:3,reject:3,every:3,all:3,some:3,any:3,include:3,includes:3,contains:3,invoke:0,max:3,min:3,toArray:1,size:1,first:3,head:3,take:3,initial:3,rest:3,tail:3,drop:3,last:3,without:0,difference:0,indexOf:3,shuffle:1,lastIndexOf:3,isEmpty:1,chain:1,sample:3,partition:3,groupBy:3,countBy:3,sortBy:3,indexBy:3,findIndex:3,findLastIndex:3},"models"],[b,{keys:1,values:1,pairs:1,invert:1,pick:0,omit:0,chain:1,isEmpty:1},"attributes"]],(function(e){var t=e[0],n=e[1],a=e[2];t.mixin=function(e){var n=o.reduce(o.functions(e),(function(e,t){return e[t]=0,e}),{});q(t,e,n,a)},q(t,o,n,a)})),t.sync=function(e,n,a){var i=V[e];o.defaults(a||(a={}),{emulateHTTP:t.emulateHTTP,emulateJSON:t.emulateJSON});var r={type:i,dataType:"json"};if(a.url||(r.url=o.result(n,"url")||O()),null!=a.data||!n||"create"!==e&&"update"!==e&&"patch"!==e||(r.contentType="application/json",r.data=JSON.stringify(a.attrs||n.toJSON(a))),a.emulateJSON&&(r.contentType="application/x-www-form-urlencoded",r.data=r.data?{model:r.data}:{}),a.emulateHTTP&&("PUT"===i||"DELETE"===i||"PATCH"===i)){r.type="POST",a.emulateJSON&&(r.data._method=i);var s=a.beforeSend;a.beforeSend=function(e){if(e.setRequestHeader("X-HTTP-Method-Override",i),s)return s.apply(this,arguments)}}"GET"===r.type||a.emulateJSON||(r.processData=!1);var c=a.error;a.error=function(e,t,o){a.textStatus=t,a.errorThrown=o,c&&c.call(a.context,e,t,o)};var m=a.xhr=t.ajax(o.extend(r,a));return n.trigger("request",n,m,a),m};var V={create:"POST",update:"PUT",patch:"PATCH",delete:"DELETE",read:"GET"};t.ajax=function(){return t.$.ajax.apply(t.$,arguments)};var B=t.Router=function(e){e||(e={}),this.preinitialize.apply(this,arguments),e.routes&&(this.routes=e.routes),this._bindRoutes(),this.initialize.apply(this,arguments)},R=/\((.*?)\)/g,G=/(\(\?)?:\w+/g,j=/\*\w+/g,F=/[\-{}\[\]+?.,\\\^$|#\s]/g;o.extend(B.prototype,s,{preinitialize:function(){},initialize:function(){},route:function(e,n,a){o.isRegExp(e)||(e=this._routeToRegExp(e)),o.isFunction(n)&&(a=n,n=""),a||(a=this[n]);var i=this;return t.history.route(e,(function(o){var r=i._extractParameters(e,o);!1!==i.execute(a,r,n)&&(i.trigger.apply(i,["route:"+n].concat(r)),i.trigger("route",n,r),t.history.trigger("route",i,n,r))})),this},execute:function(e,t,o){e&&e.apply(this,t)},navigate:function(e,o){return t.history.navigate(e,o),this},_bindRoutes:function(){if(this.routes){this.routes=o.result(this,"routes");for(var e,t=o.keys(this.routes);null!=(e=t.pop());)this.route(e,this.routes[e])}},_routeToRegExp:function(e){return e=e.replace(F,"\\$&").replace(R,"(?:$1)?").replace(G,(function(e,t){return t?e:"([^/?]+)"})).replace(j,"([^?]*?)"),new RegExp("^"+e+"(?:\\?([\\s\\S]*))?$")},_extractParameters:function(e,t){var n=e.exec(t).slice(1);return o.map(n,(function(e,t){return t===n.length-1?e||null:e?decodeURIComponent(e):null}))}});var H=t.History=function(){this.handlers=[],this.checkUrl=this.checkUrl.bind(this),"undefined"!=typeof window&&(this.location=window.location,this.history=window.history)},N=/^[#\/]|\s+$/g,I=/^\/+|\/+$/g,P=/#.*$/;H.started=!1,o.extend(H.prototype,s,{interval:50,atRoot:function(){return this.location.pathname.replace(/[^\/]$/,"$&/")===this.root&&!this.getSearch()},matchRoot:function(){return this.decodeFragment(this.location.pathname).slice(0,this.root.length-1)+"/"===this.root},decodeFragment:function(e){return decodeURI(e.replace(/%25/g,"%2525"))},getSearch:function(){var e=this.location.href.replace(/#.*/,"").match(/\?.+/);return e?e[0]:""},getHash:function(e){var t=(e||this).location.href.match(/#(.*)$/);return t?t[1]:""},getPath:function(){var e=this.decodeFragment(this.location.pathname+this.getSearch()).slice(this.root.length-1);return"/"===e.charAt(0)?e.slice(1):e},getFragment:function(e){return null==e&&(e=this._usePushState||!this._wantsHashChange?this.getPath():this.getHash()),e.replace(N,"")},start:function(e){if(H.started)throw new Error("Backbone.history has already been started");if(H.started=!0,this.options=o.extend({root:"/"},this.options,e),this.root=this.options.root,this._wantsHashChange=!1!==this.options.hashChange,this._hasHashChange="onhashchange"in window&&(void 0===document.documentMode||document.documentMode>7),this._useHashChange=this._wantsHashChange&&this._hasHashChange,this._wantsPushState=!!this.options.pushState,this._hasPushState=!(!this.history||!this.history.pushState),this._usePushState=this._wantsPushState&&this._hasPushState,this.fragment=this.getFragment(),this.root=("/"+this.root+"/").replace(I,"/"),this._wantsHashChange&&this._wantsPushState){if(!this._hasPushState&&!this.atRoot()){var t=this.root.slice(0,-1)||"/";return this.location.replace(t+"#"+this.getPath()),!0}this._hasPushState&&this.atRoot()&&this.navigate(this.getHash(),{replace:!0})}if(!this._hasHashChange&&this._wantsHashChange&&!this._usePushState){this.iframe=document.createElement("iframe"),this.iframe.src="javascript:0",this.iframe.style.display="none",this.iframe.tabIndex=-1;var n=document.body,a=n.insertBefore(this.iframe,n.firstChild).contentWindow;a.document.open(),a.document.close(),a.location.hash="#"+this.fragment}var i=window.addEventListener||function(e,t){return attachEvent("on"+e,t)};if(this._usePushState?i("popstate",this.checkUrl,!1):this._useHashChange&&!this.iframe?i("hashchange",this.checkUrl,!1):this._wantsHashChange&&(this._checkUrlInterval=setInterval(this.checkUrl,this.interval)),!this.options.silent)return this.loadUrl()},stop:function(){var e=window.removeEventListener||function(e,t){return detachEvent("on"+e,t)};this._usePushState?e("popstate",this.checkUrl,!1):this._useHashChange&&!this.iframe&&e("hashchange",this.checkUrl,!1),this.iframe&&(document.body.removeChild(this.iframe),this.iframe=null),this._checkUrlInterval&&clearInterval(this._checkUrlInterval),H.started=!1},route:function(e,t){this.handlers.unshift({route:e,callback:t})},checkUrl:function(e){var t=this.getFragment();if(t===this.fragment&&this.iframe&&(t=this.getHash(this.iframe.contentWindow)),t===this.fragment)return!1;this.iframe&&this.navigate(t),this.loadUrl()},loadUrl:function(e){return!!this.matchRoot()&&(e=this.fragment=this.getFragment(e),o.some(this.handlers,(function(t){if(t.route.test(e))return t.callback(e),!0})))},navigate:function(e,t){if(!H.started)return!1;t&&!0!==t||(t={trigger:!!t}),e=this.getFragment(e||"");var o=this.root;""!==e&&"?"!==e.charAt(0)||(o=o.slice(0,-1)||"/");var n=o+e;e=e.replace(P,"");var a=this.decodeFragment(e);if(this.fragment!==a){if(this.fragment=a,this._usePushState)this.history[t.replace?"replaceState":"pushState"]({},document.title,n);else{if(!this._wantsHashChange)return this.location.assign(n);if(this._updateHash(this.location,e,t.replace),this.iframe&&e!==this.getHash(this.iframe.contentWindow)){var i=this.iframe.contentWindow;t.replace||(i.document.open(),i.document.close()),this._updateHash(i.location,e,t.replace)}}return t.trigger?this.loadUrl(e):void 0}},_updateHash:function(e,t,o){if(o){var n=e.href.replace(/(javascript:|#).*$/,"");e.replace(n+"#"+t)}else e.hash="#"+t}}),t.history=new H;b.extend=v.extend=B.extend=D.extend=H.extend=function(e,t){var n,a=this;return n=e&&o.has(e,"constructor")?e.constructor:function(){return a.apply(this,arguments)},o.extend(n,a,t),n.prototype=o.create(a.prototype,e),n.prototype.constructor=n,n.__super__=a.prototype,n};var O=function(){throw new Error('A "url" property or function must be specified')},L=function(e,t){var o=t.error;t.error=function(n){o&&o.call(t.context,e,n,t),e.trigger("error",e,n,t)}};return t}))}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{jquery:8,underscore:2}],2:[function(e,t,o){(function(e){!function(){var n="object"==typeof self&&self.self===self&&self||"object"==typeof e&&e.global===e&&e||this||{},a=n._,i=Array.prototype,r=Object.prototype,s="undefined"!=typeof Symbol?Symbol.prototype:null,c=i.push,m=i.slice,l=r.toString,u=r.hasOwnProperty,d=Array.isArray,h=Object.keys,p=Object.create,g=function(){},f=function(e){return e instanceof f?e:this instanceof f?void(this._wrapped=e):new f(e)};void 0===o||o.nodeType?n._=f:(void 0!==t&&!t.nodeType&&t.exports&&(o=t.exports=f),o._=f),f.VERSION="1.9.2";var b,v=function(e,t,o){if(void 0===t)return e;switch(null==o?3:o){case 1:return function(o){return e.call(t,o)};case 3:return function(o,n,a){return e.call(t,o,n,a)};case 4:return function(o,n,a,i){return e.call(t,o,n,a,i)}}return function(){return e.apply(t,arguments)}},w=function(e,t,o){return f.iteratee!==b?f.iteratee(e,t):null==e?f.identity:f.isFunction(e)?v(e,t,o):f.isObject(e)&&!f.isArray(e)?f.matcher(e):f.property(e)};f.iteratee=b=function(e,t){return w(e,t,1/0)};var y=function(e,t){return t=null==t?e.length-1:+t,function(){for(var o=Math.max(arguments.length-t,0),n=Array(o),a=0;a<o;a++)n[a]=arguments[a+t];switch(t){case 0:return e.call(this,n);case 1:return e.call(this,arguments[0],n);case 2:return e.call(this,arguments[0],arguments[1],n)}var i=Array(t+1);for(a=0;a<t;a++)i[a]=arguments[a];return i[t]=n,e.apply(this,i)}},k=function(e){if(!f.isObject(e))return{};if(p)return p(e);g.prototype=e;var t=new g;return g.prototype=null,t},C=function(e){return function(t){return null==t?void 0:t[e]}},A=function(e,t){return null!=e&&u.call(e,t)},x=function(e,t){for(var o=t.length,n=0;n<o;n++){if(null==e)return;e=e[t[n]]}return o?e:void 0},M=Math.pow(2,53)-1,_=C("length"),D=function(e){var t=_(e);return"number"==typeof t&&t>=0&&t<=M};f.each=f.forEach=function(e,t,o){var n,a;if(t=v(t,o),D(e))for(n=0,a=e.length;n<a;n++)t(e[n],n,e);else{var i=f.keys(e);for(n=0,a=i.length;n<a;n++)t(e[i[n]],i[n],e)}return e},f.map=f.collect=function(e,t,o){t=w(t,o);for(var n=!D(e)&&f.keys(e),a=(n||e).length,i=Array(a),r=0;r<a;r++){var s=n?n[r]:r;i[r]=t(e[s],s,e)}return i};var E=function(e){var t=function(t,o,n,a){var i=!D(t)&&f.keys(t),r=(i||t).length,s=e>0?0:r-1;for(a||(n=t[i?i[s]:s],s+=e);s>=0&&s<r;s+=e){var c=i?i[s]:s;n=o(n,t[c],c,t)}return n};return function(e,o,n,a){var i=arguments.length>=3;return t(e,v(o,a,4),n,i)}};f.reduce=f.foldl=f.inject=E(1),f.reduceRight=f.foldr=E(-1),f.find=f.detect=function(e,t,o){var n=(D(e)?f.findIndex:f.findKey)(e,t,o);if(void 0!==n&&-1!==n)return e[n]},f.filter=f.select=function(e,t,o){var n=[];return t=w(t,o),f.each(e,(function(e,o,a){t(e,o,a)&&n.push(e)})),n},f.reject=function(e,t,o){return f.filter(e,f.negate(w(t)),o)},f.every=f.all=function(e,t,o){t=w(t,o);for(var n=!D(e)&&f.keys(e),a=(n||e).length,i=0;i<a;i++){var r=n?n[i]:i;if(!t(e[r],r,e))return!1}return!0},f.some=f.any=function(e,t,o){t=w(t,o);for(var n=!D(e)&&f.keys(e),a=(n||e).length,i=0;i<a;i++){var r=n?n[i]:i;if(t(e[r],r,e))return!0}return!1},f.contains=f.includes=f.include=function(e,t,o,n){return D(e)||(e=f.values(e)),("number"!=typeof o||n)&&(o=0),f.indexOf(e,t,o)>=0},f.invoke=y((function(e,t,o){var n,a;return f.isFunction(t)?a=t:f.isArray(t)&&(n=t.slice(0,-1),t=t[t.length-1]),f.map(e,(function(e){var i=a;if(!i){if(n&&n.length&&(e=x(e,n)),null==e)return;i=e[t]}return null==i?i:i.apply(e,o)}))})),f.pluck=function(e,t){return f.map(e,f.property(t))},f.where=function(e,t){return f.filter(e,f.matcher(t))},f.findWhere=function(e,t){return f.find(e,f.matcher(t))},f.max=function(e,t,o){var n,a,i=-1/0,r=-1/0;if(null==t||"number"==typeof t&&"object"!=typeof e[0]&&null!=e)for(var s=0,c=(e=D(e)?e:f.values(e)).length;s<c;s++)null!=(n=e[s])&&n>i&&(i=n);else t=w(t,o),f.each(e,(function(e,o,n){((a=t(e,o,n))>r||a===-1/0&&i===-1/0)&&(i=e,r=a)}));return i},f.min=function(e,t,o){var n,a,i=1/0,r=1/0;if(null==t||"number"==typeof t&&"object"!=typeof e[0]&&null!=e)for(var s=0,c=(e=D(e)?e:f.values(e)).length;s<c;s++)null!=(n=e[s])&&n<i&&(i=n);else t=w(t,o),f.each(e,(function(e,o,n){((a=t(e,o,n))<r||a===1/0&&i===1/0)&&(i=e,r=a)}));return i},f.shuffle=function(e){return f.sample(e,1/0)},f.sample=function(e,t,o){if(null==t||o)return D(e)||(e=f.values(e)),e[f.random(e.length-1)];var n=D(e)?f.clone(e):f.values(e),a=_(n);t=Math.max(Math.min(t,a),0);for(var i=a-1,r=0;r<t;r++){var s=f.random(r,i),c=n[r];n[r]=n[s],n[s]=c}return n.slice(0,t)},f.sortBy=function(e,t,o){var n=0;return t=w(t,o),f.pluck(f.map(e,(function(e,o,a){return{value:e,index:n++,criteria:t(e,o,a)}})).sort((function(e,t){var o=e.criteria,n=t.criteria;if(o!==n){if(o>n||void 0===o)return 1;if(o<n||void 0===n)return-1}return e.index-t.index})),"value")};var T=function(e,t){return function(o,n,a){var i=t?[[],[]]:{};return n=w(n,a),f.each(o,(function(t,a){var r=n(t,a,o);e(i,t,r)})),i}};f.groupBy=T((function(e,t,o){A(e,o)?e[o].push(t):e[o]=[t]})),f.indexBy=T((function(e,t,o){e[o]=t})),f.countBy=T((function(e,t,o){A(e,o)?e[o]++:e[o]=1}));var q=/[^\ud800-\udfff]|[\ud800-\udbff][\udc00-\udfff]|[\ud800-\udfff]/g;f.toArray=function(e){return e?f.isArray(e)?m.call(e):f.isString(e)?e.match(q):D(e)?f.map(e,f.identity):f.values(e):[]},f.size=function(e){return null==e?0:D(e)?e.length:f.keys(e).length},f.partition=T((function(e,t,o){e[o?0:1].push(t)}),!0),f.first=f.head=f.take=function(e,t,o){return null==e||e.length<1?null==t?void 0:[]:null==t||o?e[0]:f.initial(e,e.length-t)},f.initial=function(e,t,o){return m.call(e,0,Math.max(0,e.length-(null==t||o?1:t)))},f.last=function(e,t,o){return null==e||e.length<1?null==t?void 0:[]:null==t||o?e[e.length-1]:f.rest(e,Math.max(0,e.length-t))},f.rest=f.tail=f.drop=function(e,t,o){return m.call(e,null==t||o?1:t)},f.compact=function(e){return f.filter(e,Boolean)};var S=function(e,t,o,n){for(var a=(n=n||[]).length,i=0,r=_(e);i<r;i++){var s=e[i];if(D(s)&&(f.isArray(s)||f.isArguments(s)))if(t)for(var c=0,m=s.length;c<m;)n[a++]=s[c++];else S(s,t,o,n),a=n.length;else o||(n[a++]=s)}return n};f.flatten=function(e,t){return S(e,t,!1)},f.without=y((function(e,t){return f.difference(e,t)})),f.uniq=f.unique=function(e,t,o,n){f.isBoolean(t)||(n=o,o=t,t=!1),null!=o&&(o=w(o,n));for(var a=[],i=[],r=0,s=_(e);r<s;r++){var c=e[r],m=o?o(c,r,e):c;t&&!o?(r&&i===m||a.push(c),i=m):o?f.contains(i,m)||(i.push(m),a.push(c)):f.contains(a,c)||a.push(c)}return a},f.union=y((function(e){return f.uniq(S(e,!0,!0))})),f.intersection=function(e){for(var t=[],o=arguments.length,n=0,a=_(e);n<a;n++){var i=e[n];if(!f.contains(t,i)){var r;for(r=1;r<o&&f.contains(arguments[r],i);r++);r===o&&t.push(i)}}return t},f.difference=y((function(e,t){return t=S(t,!0,!0),f.filter(e,(function(e){return!f.contains(t,e)}))})),f.unzip=function(e){for(var t=e&&f.max(e,_).length||0,o=Array(t),n=0;n<t;n++)o[n]=f.pluck(e,n);return o},f.zip=y(f.unzip),f.object=function(e,t){for(var o={},n=0,a=_(e);n<a;n++)t?o[e[n]]=t[n]:o[e[n][0]]=e[n][1];return o};var z=function(e){return function(t,o,n){o=w(o,n);for(var a=_(t),i=e>0?0:a-1;i>=0&&i<a;i+=e)if(o(t[i],i,t))return i;return-1}};f.findIndex=z(1),f.findLastIndex=z(-1),f.sortedIndex=function(e,t,o,n){for(var a=(o=w(o,n,1))(t),i=0,r=_(e);i<r;){var s=Math.floor((i+r)/2);o(e[s])<a?i=s+1:r=s}return i};var V=function(e,t,o){return function(n,a,i){var r=0,s=_(n);if("number"==typeof i)e>0?r=i>=0?i:Math.max(i+s,r):s=i>=0?Math.min(i+1,s):i+s+1;else if(o&&i&&s)return n[i=o(n,a)]===a?i:-1;if(a!=a)return(i=t(m.call(n,r,s),f.isNaN))>=0?i+r:-1;for(i=e>0?r:s-1;i>=0&&i<s;i+=e)if(n[i]===a)return i;return-1}};f.indexOf=V(1,f.findIndex,f.sortedIndex),f.lastIndexOf=V(-1,f.findLastIndex),f.range=function(e,t,o){null==t&&(t=e||0,e=0),o||(o=t<e?-1:1);for(var n=Math.max(Math.ceil((t-e)/o),0),a=Array(n),i=0;i<n;i++,e+=o)a[i]=e;return a},f.chunk=function(e,t){if(null==t||t<1)return[];for(var o=[],n=0,a=e.length;n<a;)o.push(m.call(e,n,n+=t));return o};var B=function(e,t,o,n,a){if(!(n instanceof t))return e.apply(o,a);var i=k(e.prototype),r=e.apply(i,a);return f.isObject(r)?r:i};f.bind=y((function(e,t,o){if(!f.isFunction(e))throw new TypeError("Bind must be called on a function");var n=y((function(a){return B(e,n,t,this,o.concat(a))}));return n})),f.partial=y((function(e,t){var o=f.partial.placeholder,n=function(){for(var a=0,i=t.length,r=Array(i),s=0;s<i;s++)r[s]=t[s]===o?arguments[a++]:t[s];for(;a<arguments.length;)r.push(arguments[a++]);return B(e,n,this,this,r)};return n})),f.partial.placeholder=f,f.bindAll=y((function(e,t){var o=(t=S(t,!1,!1)).length;if(o<1)throw new Error("bindAll must be passed function names");for(;o--;){var n=t[o];e[n]=f.bind(e[n],e)}})),f.memoize=function(e,t){var o=function(n){var a=o.cache,i=""+(t?t.apply(this,arguments):n);return A(a,i)||(a[i]=e.apply(this,arguments)),a[i]};return o.cache={},o},f.delay=y((function(e,t,o){return setTimeout((function(){return e.apply(null,o)}),t)})),f.defer=f.partial(f.delay,f,1),f.throttle=function(e,t,o){var n,a,i,r,s=0;o||(o={});var c=function(){s=!1===o.leading?0:f.now(),n=null,r=e.apply(a,i),n||(a=i=null)},m=function(){var m=f.now();s||!1!==o.leading||(s=m);var l=t-(m-s);return a=this,i=arguments,l<=0||l>t?(n&&(clearTimeout(n),n=null),s=m,r=e.apply(a,i),n||(a=i=null)):n||!1===o.trailing||(n=setTimeout(c,l)),r};return m.cancel=function(){clearTimeout(n),s=0,n=a=i=null},m},f.debounce=function(e,t,o){var n,a,i=function(t,o){n=null,o&&(a=e.apply(t,o))},r=y((function(r){if(n&&clearTimeout(n),o){var s=!n;n=setTimeout(i,t),s&&(a=e.apply(this,r))}else n=f.delay(i,t,this,r);return a}));return r.cancel=function(){clearTimeout(n),n=null},r},f.wrap=function(e,t){return f.partial(t,e)},f.negate=function(e){return function(){return!e.apply(this,arguments)}},f.compose=function(){var e=arguments,t=e.length-1;return function(){for(var o=t,n=e[t].apply(this,arguments);o--;)n=e[o].call(this,n);return n}},f.after=function(e,t){return function(){if(--e<1)return t.apply(this,arguments)}},f.before=function(e,t){var o;return function(){return--e>0&&(o=t.apply(this,arguments)),e<=1&&(t=null),o}},f.once=f.partial(f.before,2),f.restArguments=y;var R=!{toString:null}.propertyIsEnumerable("toString"),G=["valueOf","isPrototypeOf","toString","propertyIsEnumerable","hasOwnProperty","toLocaleString"],j=function(e,t){var o=G.length,n=e.constructor,a=f.isFunction(n)&&n.prototype||r,i="constructor";for(A(e,i)&&!f.contains(t,i)&&t.push(i);o--;)(i=G[o])in e&&e[i]!==a[i]&&!f.contains(t,i)&&t.push(i)};f.keys=function(e){if(!f.isObject(e))return[];if(h)return h(e);var t=[];for(var o in e)A(e,o)&&t.push(o);return R&&j(e,t),t},f.allKeys=function(e){if(!f.isObject(e))return[];var t=[];for(var o in e)t.push(o);return R&&j(e,t),t},f.values=function(e){for(var t=f.keys(e),o=t.length,n=Array(o),a=0;a<o;a++)n[a]=e[t[a]];return n},f.mapObject=function(e,t,o){t=w(t,o);for(var n=f.keys(e),a=n.length,i={},r=0;r<a;r++){var s=n[r];i[s]=t(e[s],s,e)}return i},f.pairs=function(e){for(var t=f.keys(e),o=t.length,n=Array(o),a=0;a<o;a++)n[a]=[t[a],e[t[a]]];return n},f.invert=function(e){for(var t={},o=f.keys(e),n=0,a=o.length;n<a;n++)t[e[o[n]]]=o[n];return t},f.functions=f.methods=function(e){var t=[];for(var o in e)f.isFunction(e[o])&&t.push(o);return t.sort()};var F=function(e,t){return function(o){var n=arguments.length;if(t&&(o=Object(o)),n<2||null==o)return o;for(var a=1;a<n;a++)for(var i=arguments[a],r=e(i),s=r.length,c=0;c<s;c++){var m=r[c];t&&void 0!==o[m]||(o[m]=i[m])}return o}};f.extend=F(f.allKeys),f.extendOwn=f.assign=F(f.keys),f.findKey=function(e,t,o){t=w(t,o);for(var n,a=f.keys(e),i=0,r=a.length;i<r;i++)if(t(e[n=a[i]],n,e))return n};var H,N,I=function(e,t,o){return t in o};f.pick=y((function(e,t){var o={},n=t[0];if(null==e)return o;f.isFunction(n)?(t.length>1&&(n=v(n,t[1])),t=f.allKeys(e)):(n=I,t=S(t,!1,!1),e=Object(e));for(var a=0,i=t.length;a<i;a++){var r=t[a],s=e[r];n(s,r,e)&&(o[r]=s)}return o})),f.omit=y((function(e,t){var o,n=t[0];return f.isFunction(n)?(n=f.negate(n),t.length>1&&(o=t[1])):(t=f.map(S(t,!1,!1),String),n=function(e,o){return!f.contains(t,o)}),f.pick(e,n,o)})),f.defaults=F(f.allKeys,!0),f.create=function(e,t){var o=k(e);return t&&f.extendOwn(o,t),o},f.clone=function(e){return f.isObject(e)?f.isArray(e)?e.slice():f.extend({},e):e},f.tap=function(e,t){return t(e),e},f.isMatch=function(e,t){var o=f.keys(t),n=o.length;if(null==e)return!n;for(var a=Object(e),i=0;i<n;i++){var r=o[i];if(t[r]!==a[r]||!(r in a))return!1}return!0},H=function(e,t,o,n){if(e===t)return 0!==e||1/e==1/t;if(null==e||null==t)return!1;if(e!=e)return t!=t;var a=typeof e;return("function"===a||"object"===a||"object"==typeof t)&&N(e,t,o,n)},N=function(e,t,o,n){e instanceof f&&(e=e._wrapped),t instanceof f&&(t=t._wrapped);var a=l.call(e);if(a!==l.call(t))return!1;switch(a){case"[object RegExp]":case"[object String]":return""+e==""+t;case"[object Number]":return+e!=+e?+t!=+t:0==+e?1/+e==1/t:+e==+t;case"[object Date]":case"[object Boolean]":return+e==+t;case"[object Symbol]":return s.valueOf.call(e)===s.valueOf.call(t)}var i="[object Array]"===a;if(!i){if("object"!=typeof e||"object"!=typeof t)return!1;var r=e.constructor,c=t.constructor;if(r!==c&&!(f.isFunction(r)&&r instanceof r&&f.isFunction(c)&&c instanceof c)&&"constructor"in e&&"constructor"in t)return!1}n=n||[];for(var m=(o=o||[]).length;m--;)if(o[m]===e)return n[m]===t;if(o.push(e),n.push(t),i){if((m=e.length)!==t.length)return!1;for(;m--;)if(!H(e[m],t[m],o,n))return!1}else{var u,d=f.keys(e);if(m=d.length,f.keys(t).length!==m)return!1;for(;m--;)if(u=d[m],!A(t,u)||!H(e[u],t[u],o,n))return!1}return o.pop(),n.pop(),!0},f.isEqual=function(e,t){return H(e,t)},f.isEmpty=function(e){return null==e||(D(e)&&(f.isArray(e)||f.isString(e)||f.isArguments(e))?0===e.length:0===f.keys(e).length)},f.isElement=function(e){return!(!e||1!==e.nodeType)},f.isArray=d||function(e){return"[object Array]"===l.call(e)},f.isObject=function(e){var t=typeof e;return"function"===t||"object"===t&&!!e},f.each(["Arguments","Function","String","Number","Date","RegExp","Error","Symbol","Map","WeakMap","Set","WeakSet"],(function(e){f["is"+e]=function(t){return l.call(t)==="[object "+e+"]"}})),f.isArguments(arguments)||(f.isArguments=function(e){return A(e,"callee")});var P=n.document&&n.document.childNodes;"function"!=typeof/./&&"object"!=typeof Int8Array&&"function"!=typeof P&&(f.isFunction=function(e){return"function"==typeof e||!1}),f.isFinite=function(e){return!f.isSymbol(e)&&isFinite(e)&&!isNaN(parseFloat(e))},f.isNaN=function(e){return f.isNumber(e)&&isNaN(e)},f.isBoolean=function(e){return!0===e||!1===e||"[object Boolean]"===l.call(e)},f.isNull=function(e){return null===e},f.isUndefined=function(e){return void 0===e},f.has=function(e,t){if(!f.isArray(t))return A(e,t);for(var o=t.length,n=0;n<o;n++){var a=t[n];if(null==e||!u.call(e,a))return!1;e=e[a]}return!!o},f.noConflict=function(){return n._=a,this},f.identity=function(e){return e},f.constant=function(e){return function(){return e}},f.noop=function(){},f.property=function(e){return f.isArray(e)?function(t){return x(t,e)}:C(e)},f.propertyOf=function(e){return null==e?function(){}:function(t){return f.isArray(t)?x(e,t):e[t]}},f.matcher=f.matches=function(e){return e=f.extendOwn({},e),function(t){return f.isMatch(t,e)}},f.times=function(e,t,o){var n=Array(Math.max(0,e));t=v(t,o,1);for(var a=0;a<e;a++)n[a]=t(a);return n},f.random=function(e,t){return null==t&&(t=e,e=0),e+Math.floor(Math.random()*(t-e+1))},f.now=Date.now||function(){return(new Date).getTime()};var O={"&":"&amp;","<":"&lt;",">":"&gt;",'"':"&quot;","'":"&#x27;","`":"&#x60;"},L=f.invert(O),U=function(e){var t=function(t){return e[t]},o="(?:"+f.keys(e).join("|")+")",n=RegExp(o),a=RegExp(o,"g");return function(e){return e=null==e?"":""+e,n.test(e)?e.replace(a,t):e}};f.escape=U(O),f.unescape=U(L),f.result=function(e,t,o){f.isArray(t)||(t=[t]);var n=t.length;if(!n)return f.isFunction(o)?o.call(e):o;for(var a=0;a<n;a++){var i=null==e?void 0:e[t[a]];void 0===i&&(i=o,a=n),e=f.isFunction(i)?i.call(e):i}return e};var W=0;f.uniqueId=function(e){var t=++W+"";return e?e+t:t},f.templateSettings={evaluate:/<%([\s\S]+?)%>/g,interpolate:/<%=([\s\S]+?)%>/g,escape:/<%-([\s\S]+?)%>/g};var $=/(.)^/,Q={"'":"'","\\":"\\","\r":"r","\n":"n","\u2028":"u2028","\u2029":"u2029"},K=/\\|'|\r|\n|\u2028|\u2029/g,J=function(e){return"\\"+Q[e]};f.template=function(e,t,o){!t&&o&&(t=o),t=f.defaults({},t,f.templateSettings);var n,a=RegExp([(t.escape||$).source,(t.interpolate||$).source,(t.evaluate||$).source].join("|")+"|$","g"),i=0,r="__p+='";e.replace(a,(function(t,o,n,a,s){return r+=e.slice(i,s).replace(K,J),i=s+t.length,o?r+="'+\n((__t=("+o+"))==null?'':_.escape(__t))+\n'":n?r+="'+\n((__t=("+n+"))==null?'':__t)+\n'":a&&(r+="';\n"+a+"\n__p+='"),t})),r+="';\n",t.variable||(r="with(obj||{}){\n"+r+"}\n"),r="var __t,__p='',__j=Array.prototype.join,print=function(){__p+=__j.call(arguments,'');};\n"+r+"return __p;\n";try{n=new Function(t.variable||"obj","_",r)}catch(e){throw e.source=r,e}var s=function(e){return n.call(this,e,f)},c=t.variable||"obj";return s.source="function("+c+"){\n"+r+"}",s},f.chain=function(e){var t=f(e);return t._chain=!0,t};var Y=function(e,t){return e._chain?f(t).chain():t};f.mixin=function(e){return f.each(f.functions(e),(function(t){var o=f[t]=e[t];f.prototype[t]=function(){var e=[this._wrapped];return c.apply(e,arguments),Y(this,o.apply(f,e))}})),f},f.mixin(f),f.each(["pop","push","reverse","shift","sort","splice","unshift"],(function(e){var t=i[e];f.prototype[e]=function(){var o=this._wrapped;return t.apply(o,arguments),"shift"!==e&&"splice"!==e||0!==o.length||delete o[0],Y(this,o)}})),f.each(["concat","join","slice"],(function(e){var t=i[e];f.prototype[e]=function(){return Y(this,t.apply(this._wrapped,arguments))}})),f.prototype.value=function(){return this._wrapped},f.prototype.valueOf=f.prototype.toJSON=f.prototype.value,f.prototype.toString=function(){return String(this._wrapped)},"function"==typeof define&&define.amd&&define("underscore",[],(function(){return f}))}()}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{}],3:[function(e,t,o){},{}],4:[function(e,t,o){var n=Object.create||function(e){var t=function(){};return t.prototype=e,new t},a=Object.keys||function(e){var t=[];for(var o in e)Object.prototype.hasOwnProperty.call(e,o)&&t.push(o);return o},i=Function.prototype.bind||function(e){var t=this;return function(){return t.apply(e,arguments)}};function r(){this._events&&Object.prototype.hasOwnProperty.call(this,"_events")||(this._events=n(null),this._eventsCount=0),this._maxListeners=this._maxListeners||void 0}t.exports=r,r.EventEmitter=r,r.prototype._events=void 0,r.prototype._maxListeners=void 0;var s,c=10;try{var m={};Object.defineProperty&&Object.defineProperty(m,"x",{value:0}),s=0===m.x}catch(e){s=!1}function l(e){return void 0===e._maxListeners?r.defaultMaxListeners:e._maxListeners}function u(e,t,o){if(t)e.call(o);else for(var n=e.length,a=k(e,n),i=0;i<n;++i)a[i].call(o)}function d(e,t,o,n){if(t)e.call(o,n);else for(var a=e.length,i=k(e,a),r=0;r<a;++r)i[r].call(o,n)}function h(e,t,o,n,a){if(t)e.call(o,n,a);else for(var i=e.length,r=k(e,i),s=0;s<i;++s)r[s].call(o,n,a)}function p(e,t,o,n,a,i){if(t)e.call(o,n,a,i);else for(var r=e.length,s=k(e,r),c=0;c<r;++c)s[c].call(o,n,a,i)}function g(e,t,o,n){if(t)e.apply(o,n);else for(var a=e.length,i=k(e,a),r=0;r<a;++r)i[r].apply(o,n)}function f(e,t,o,a){var i,r,s;if("function"!=typeof o)throw new TypeError('"listener" argument must be a function');if((r=e._events)?(r.newListener&&(e.emit("newListener",t,o.listener?o.listener:o),r=e._events),s=r[t]):(r=e._events=n(null),e._eventsCount=0),s){if("function"==typeof s?s=r[t]=a?[o,s]:[s,o]:a?s.unshift(o):s.push(o),!s.warned&&(i=l(e))&&i>0&&s.length>i){s.warned=!0;var c=new Error("Possible EventEmitter memory leak detected. "+s.length+' "'+String(t)+'" listeners added. Use emitter.setMaxListeners() to increase limit.');c.name="MaxListenersExceededWarning",c.emitter=e,c.type=t,c.count=s.length,"object"==typeof console&&console.warn&&console.warn("%s: %s",c.name,c.message)}}else s=r[t]=o,++e._eventsCount;return e}function b(){if(!this.fired)switch(this.target.removeListener(this.type,this.wrapFn),this.fired=!0,arguments.length){case 0:return this.listener.call(this.target);case 1:return this.listener.call(this.target,arguments[0]);case 2:return this.listener.call(this.target,arguments[0],arguments[1]);case 3:return this.listener.call(this.target,arguments[0],arguments[1],arguments[2]);default:for(var e=new Array(arguments.length),t=0;t<e.length;++t)e[t]=arguments[t];this.listener.apply(this.target,e)}}function v(e,t,o){var n={fired:!1,wrapFn:void 0,target:e,type:t,listener:o},a=i.call(b,n);return a.listener=o,n.wrapFn=a,a}function w(e,t,o){var n=e._events;if(!n)return[];var a=n[t];return a?"function"==typeof a?o?[a.listener||a]:[a]:o?function(e){for(var t=new Array(e.length),o=0;o<t.length;++o)t[o]=e[o].listener||e[o];return t}(a):k(a,a.length):[]}function y(e){var t=this._events;if(t){var o=t[e];if("function"==typeof o)return 1;if(o)return o.length}return 0}function k(e,t){for(var o=new Array(t),n=0;n<t;++n)o[n]=e[n];return o}s?Object.defineProperty(r,"defaultMaxListeners",{enumerable:!0,get:function(){return c},set:function(e){if("number"!=typeof e||e<0||e!=e)throw new TypeError('"defaultMaxListeners" must be a positive number');c=e}}):r.defaultMaxListeners=c,r.prototype.setMaxListeners=function(e){if("number"!=typeof e||e<0||isNaN(e))throw new TypeError('"n" argument must be a positive number');return this._maxListeners=e,this},r.prototype.getMaxListeners=function(){return l(this)},r.prototype.emit=function(e){var t,o,n,a,i,r,s="error"===e;if(r=this._events)s=s&&null==r.error;else if(!s)return!1;if(s){if(arguments.length>1&&(t=arguments[1]),t instanceof Error)throw t;var c=new Error('Unhandled "error" event. ('+t+")");throw c.context=t,c}if(!(o=r[e]))return!1;var m="function"==typeof o;switch(n=arguments.length){case 1:u(o,m,this);break;case 2:d(o,m,this,arguments[1]);break;case 3:h(o,m,this,arguments[1],arguments[2]);break;case 4:p(o,m,this,arguments[1],arguments[2],arguments[3]);break;default:for(a=new Array(n-1),i=1;i<n;i++)a[i-1]=arguments[i];g(o,m,this,a)}return!0},r.prototype.addListener=function(e,t){return f(this,e,t,!1)},r.prototype.on=r.prototype.addListener,r.prototype.prependListener=function(e,t){return f(this,e,t,!0)},r.prototype.once=function(e,t){if("function"!=typeof t)throw new TypeError('"listener" argument must be a function');return this.on(e,v(this,e,t)),this},r.prototype.prependOnceListener=function(e,t){if("function"!=typeof t)throw new TypeError('"listener" argument must be a function');return this.prependListener(e,v(this,e,t)),this},r.prototype.removeListener=function(e,t){var o,a,i,r,s;if("function"!=typeof t)throw new TypeError('"listener" argument must be a function');if(!(a=this._events))return this;if(!(o=a[e]))return this;if(o===t||o.listener===t)0==--this._eventsCount?this._events=n(null):(delete a[e],a.removeListener&&this.emit("removeListener",e,o.listener||t));else if("function"!=typeof o){for(i=-1,r=o.length-1;r>=0;r--)if(o[r]===t||o[r].listener===t){s=o[r].listener,i=r;break}if(i<0)return this;0===i?o.shift():function(e,t){for(var o=t,n=o+1,a=e.length;n<a;o+=1,n+=1)e[o]=e[n];e.pop()}(o,i),1===o.length&&(a[e]=o[0]),a.removeListener&&this.emit("removeListener",e,s||t)}return this},r.prototype.removeAllListeners=function(e){var t,o,i;if(!(o=this._events))return this;if(!o.removeListener)return 0===arguments.length?(this._events=n(null),this._eventsCount=0):o[e]&&(0==--this._eventsCount?this._events=n(null):delete o[e]),this;if(0===arguments.length){var r,s=a(o);for(i=0;i<s.length;++i)"removeListener"!==(r=s[i])&&this.removeAllListeners(r);return this.removeAllListeners("removeListener"),this._events=n(null),this._eventsCount=0,this}if("function"==typeof(t=o[e]))this.removeListener(e,t);else if(t)for(i=t.length-1;i>=0;i--)this.removeListener(e,t[i]);return this},r.prototype.listeners=function(e){return w(this,e,!0)},r.prototype.rawListeners=function(e){return w(this,e,!1)},r.listenerCount=function(e,t){return"function"==typeof e.listenerCount?e.listenerCount(t):y.call(e,t)},r.prototype.listenerCount=y,r.prototype.eventNames=function(){return this._eventsCount>0?Reflect.ownKeys(this._events):[]}},{}],5:[function(e,t,o){"use strict";var n=function(e){};t.exports=function(e,t,o,a,i,r,s,c){if(n(t),!e){var m;if(void 0===t)m=new Error("Minified exception occurred; use the non-minified dev environment for the full error message and additional helpful warnings.");else{var l=[o,a,i,r,s,c],u=0;(m=new Error(t.replace(/%s/g,(function(){return l[u++]})))).name="Invariant Violation"}throw m.framesToPop=1,m}}},{}],6:[function(e,t,o){t.exports.Dispatcher=e("./lib/Dispatcher")},{"./lib/Dispatcher":7}],7:[function(e,t,o){(function(n){"use strict";o.__esModule=!0;var a=e("fbjs/lib/invariant"),i=function(){function e(){!function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}(this,e),this._callbacks={},this._isDispatching=!1,this._isHandled={},this._isPending={},this._lastID=1}return e.prototype.register=function(e){var t="ID_"+this._lastID++;return this._callbacks[t]=e,t},e.prototype.unregister=function(e){this._callbacks[e]||("production"!==n.env.NODE_ENV?a(!1,"Dispatcher.unregister(...): `%s` does not map to a registered callback.",e):a(!1)),delete this._callbacks[e]},e.prototype.waitFor=function(e){this._isDispatching||("production"!==n.env.NODE_ENV?a(!1,"Dispatcher.waitFor(...): Must be invoked while dispatching."):a(!1));for(var t=0;t<e.length;t++){var o=e[t];this._isPending[o]?this._isHandled[o]||("production"!==n.env.NODE_ENV?a(!1,"Dispatcher.waitFor(...): Circular dependency detected while waiting for `%s`.",o):a(!1)):(this._callbacks[o]||("production"!==n.env.NODE_ENV?a(!1,"Dispatcher.waitFor(...): `%s` does not map to a registered callback.",o):a(!1)),this._invokeCallback(o))}},e.prototype.dispatch=function(e){this._isDispatching&&("production"!==n.env.NODE_ENV?a(!1,"Dispatch.dispatch(...): Cannot dispatch in the middle of a dispatch."):a(!1)),this._startDispatching(e);try{for(var t in this._callbacks)this._isPending[t]||this._invokeCallback(t)}finally{this._stopDispatching()}},e.prototype.isDispatching=function(){return this._isDispatching},e.prototype._invokeCallback=function(e){this._isPending[e]=!0,this._callbacks[e](this._pendingPayload),this._isHandled[e]=!0},e.prototype._startDispatching=function(e){for(var t in this._callbacks)this._isPending[t]=!1,this._isHandled[t]=!1;this._pendingPayload=e,this._isDispatching=!0},e.prototype._stopDispatching=function(){delete this._pendingPayload,this._isDispatching=!1},e}();t.exports=i}).call(this,e("_process"))},{_process:13,"fbjs/lib/invariant":5}],8:[function(e,t,o){
/*!
 * jQuery JavaScript Library v1.12.4
 * http://jquery.com/
 *
 * Includes Sizzle.js
 * http://sizzlejs.com/
 *
 * Copyright jQuery Foundation and other contributors
 * Released under the MIT license
 * http://jquery.org/license
 *
 * Date: 2016-05-20T17:17Z
 */
!function(e,o){"object"==typeof t&&"object"==typeof t.exports?t.exports=e.document?o(e,!0):function(e){if(!e.document)throw new Error("jQuery requires a window with a document");return o(e)}:o(e)}("undefined"!=typeof window?window:this,(function(e,t){var o=[],n=e.document,a=o.slice,i=o.concat,r=o.push,s=o.indexOf,c={},m=c.toString,l=c.hasOwnProperty,u={},d=function(e,t){return new d.fn.init(e,t)},h=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,p=/^-ms-/,g=/-([\da-z])/gi,f=function(e,t){return t.toUpperCase()};function b(e){var t=!!e&&"length"in e&&e.length,o=d.type(e);return"function"!==o&&!d.isWindow(e)&&("array"===o||0===t||"number"==typeof t&&t>0&&t-1 in e)}d.fn=d.prototype={jquery:"1.12.4",constructor:d,selector:"",length:0,toArray:function(){return a.call(this)},get:function(e){return null!=e?e<0?this[e+this.length]:this[e]:a.call(this)},pushStack:function(e){var t=d.merge(this.constructor(),e);return t.prevObject=this,t.context=this.context,t},each:function(e){return d.each(this,e)},map:function(e){return this.pushStack(d.map(this,(function(t,o){return e.call(t,o,t)})))},slice:function(){return this.pushStack(a.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(e){var t=this.length,o=+e+(e<0?t:0);return this.pushStack(o>=0&&o<t?[this[o]]:[])},end:function(){return this.prevObject||this.constructor()},push:r,sort:o.sort,splice:o.splice},d.extend=d.fn.extend=function(){var e,t,o,n,a,i,r=arguments[0]||{},s=1,c=arguments.length,m=!1;for("boolean"==typeof r&&(m=r,r=arguments[s]||{},s++),"object"==typeof r||d.isFunction(r)||(r={}),s===c&&(r=this,s--);s<c;s++)if(null!=(a=arguments[s]))for(n in a)e=r[n],r!==(o=a[n])&&(m&&o&&(d.isPlainObject(o)||(t=d.isArray(o)))?(t?(t=!1,i=e&&d.isArray(e)?e:[]):i=e&&d.isPlainObject(e)?e:{},r[n]=d.extend(m,i,o)):void 0!==o&&(r[n]=o));return r},d.extend({expando:"jQuery"+("1.12.4"+Math.random()).replace(/\D/g,""),isReady:!0,error:function(e){throw new Error(e)},noop:function(){},isFunction:function(e){return"function"===d.type(e)},isArray:Array.isArray||function(e){return"array"===d.type(e)},isWindow:function(e){return null!=e&&e==e.window},isNumeric:function(e){var t=e&&e.toString();return!d.isArray(e)&&t-parseFloat(t)+1>=0},isEmptyObject:function(e){var t;for(t in e)return!1;return!0},isPlainObject:function(e){var t;if(!e||"object"!==d.type(e)||e.nodeType||d.isWindow(e))return!1;try{if(e.constructor&&!l.call(e,"constructor")&&!l.call(e.constructor.prototype,"isPrototypeOf"))return!1}catch(e){return!1}if(!u.ownFirst)for(t in e)return l.call(e,t);for(t in e);return void 0===t||l.call(e,t)},type:function(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?c[m.call(e)]||"object":typeof e},globalEval:function(t){t&&d.trim(t)&&(e.execScript||function(t){e.eval.call(e,t)})(t)},camelCase:function(e){return e.replace(p,"ms-").replace(g,f)},nodeName:function(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()},each:function(e,t){var o,n=0;if(b(e))for(o=e.length;n<o&&!1!==t.call(e[n],n,e[n]);n++);else for(n in e)if(!1===t.call(e[n],n,e[n]))break;return e},trim:function(e){return null==e?"":(e+"").replace(h,"")},makeArray:function(e,t){var o=t||[];return null!=e&&(b(Object(e))?d.merge(o,"string"==typeof e?[e]:e):r.call(o,e)),o},inArray:function(e,t,o){var n;if(t){if(s)return s.call(t,e,o);for(n=t.length,o=o?o<0?Math.max(0,n+o):o:0;o<n;o++)if(o in t&&t[o]===e)return o}return-1},merge:function(e,t){for(var o=+t.length,n=0,a=e.length;n<o;)e[a++]=t[n++];if(o!=o)for(;void 0!==t[n];)e[a++]=t[n++];return e.length=a,e},grep:function(e,t,o){for(var n=[],a=0,i=e.length,r=!o;a<i;a++)!t(e[a],a)!==r&&n.push(e[a]);return n},map:function(e,t,o){var n,a,r=0,s=[];if(b(e))for(n=e.length;r<n;r++)null!=(a=t(e[r],r,o))&&s.push(a);else for(r in e)null!=(a=t(e[r],r,o))&&s.push(a);return i.apply([],s)},guid:1,proxy:function(e,t){var o,n,i;if("string"==typeof t&&(i=e[t],t=e,e=i),d.isFunction(e))return o=a.call(arguments,2),(n=function(){return e.apply(t||this,o.concat(a.call(arguments)))}).guid=e.guid=e.guid||d.guid++,n},now:function(){return+new Date},support:u}),"function"==typeof Symbol&&(d.fn[Symbol.iterator]=o[Symbol.iterator]),d.each("Boolean Number String Function Array Date RegExp Object Error Symbol".split(" "),(function(e,t){c["[object "+t+"]"]=t.toLowerCase()}));var v=
/*!
 * Sizzle CSS Selector Engine v2.2.1
 * http://sizzlejs.com/
 *
 * Copyright jQuery Foundation and other contributors
 * Released under the MIT license
 * http://jquery.org/license
 *
 * Date: 2015-10-17
 */
function(e){var t,o,n,a,i,r,s,c,m,l,u,d,h,p,g,f,b,v,w,y="sizzle"+1*new Date,k=e.document,C=0,A=0,x=ae(),M=ae(),_=ae(),D=function(e,t){return e===t&&(u=!0),0},E={}.hasOwnProperty,T=[],q=T.pop,S=T.push,z=T.push,V=T.slice,B=function(e,t){for(var o=0,n=e.length;o<n;o++)if(e[o]===t)return o;return-1},R="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",G="[\\x20\\t\\r\\n\\f]",j="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",F="\\["+G+"*("+j+")(?:"+G+"*([*^$|!~]?=)"+G+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+j+"))|)"+G+"*\\]",H=":("+j+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+F+")*)|.*)\\)|)",N=new RegExp(G+"+","g"),I=new RegExp("^"+G+"+|((?:^|[^\\\\])(?:\\\\.)*)"+G+"+$","g"),P=new RegExp("^"+G+"*,"+G+"*"),O=new RegExp("^"+G+"*([>+~]|"+G+")"+G+"*"),L=new RegExp("="+G+"*([^\\]'\"]*?)"+G+"*\\]","g"),U=new RegExp(H),W=new RegExp("^"+j+"$"),$={ID:new RegExp("^#("+j+")"),CLASS:new RegExp("^\\.("+j+")"),TAG:new RegExp("^("+j+"|[*])"),ATTR:new RegExp("^"+F),PSEUDO:new RegExp("^"+H),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+G+"*(even|odd|(([+-]|)(\\d*)n|)"+G+"*(?:([+-]|)"+G+"*(\\d+)|))"+G+"*\\)|)","i"),bool:new RegExp("^(?:"+R+")$","i"),needsContext:new RegExp("^"+G+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+G+"*((?:-\\d)?\\d*)"+G+"*\\)|)(?=[^-]|$)","i")},Q=/^(?:input|select|textarea|button)$/i,K=/^h\d$/i,J=/^[^{]+\{\s*\[native \w/,Y=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,Z=/[+~]/,X=/'|\\/g,ee=new RegExp("\\\\([\\da-f]{1,6}"+G+"?|("+G+")|.)","ig"),te=function(e,t,o){var n="0x"+t-65536;return n!=n||o?t:n<0?String.fromCharCode(n+65536):String.fromCharCode(n>>10|55296,1023&n|56320)},oe=function(){d()};try{z.apply(T=V.call(k.childNodes),k.childNodes),T[k.childNodes.length].nodeType}catch(e){z={apply:T.length?function(e,t){S.apply(e,V.call(t))}:function(e,t){for(var o=e.length,n=0;e[o++]=t[n++];);e.length=o-1}}}function ne(e,t,n,a){var i,s,m,l,u,p,b,v,C=t&&t.ownerDocument,A=t?t.nodeType:9;if(n=n||[],"string"!=typeof e||!e||1!==A&&9!==A&&11!==A)return n;if(!a&&((t?t.ownerDocument||t:k)!==h&&d(t),t=t||h,g)){if(11!==A&&(p=Y.exec(e)))if(i=p[1]){if(9===A){if(!(m=t.getElementById(i)))return n;if(m.id===i)return n.push(m),n}else if(C&&(m=C.getElementById(i))&&w(t,m)&&m.id===i)return n.push(m),n}else{if(p[2])return z.apply(n,t.getElementsByTagName(e)),n;if((i=p[3])&&o.getElementsByClassName&&t.getElementsByClassName)return z.apply(n,t.getElementsByClassName(i)),n}if(o.qsa&&!_[e+" "]&&(!f||!f.test(e))){if(1!==A)C=t,v=e;else if("object"!==t.nodeName.toLowerCase()){for((l=t.getAttribute("id"))?l=l.replace(X,"\\$&"):t.setAttribute("id",l=y),s=(b=r(e)).length,u=W.test(l)?"#"+l:"[id='"+l+"']";s--;)b[s]=u+" "+pe(b[s]);v=b.join(","),C=Z.test(e)&&de(t.parentNode)||t}if(v)try{return z.apply(n,C.querySelectorAll(v)),n}catch(e){}finally{l===y&&t.removeAttribute("id")}}}return c(e.replace(I,"$1"),t,n,a)}function ae(){var e=[];return function t(o,a){return e.push(o+" ")>n.cacheLength&&delete t[e.shift()],t[o+" "]=a}}function ie(e){return e[y]=!0,e}function re(e){var t=h.createElement("div");try{return!!e(t)}catch(e){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function se(e,t){for(var o=e.split("|"),a=o.length;a--;)n.attrHandle[o[a]]=t}function ce(e,t){var o=t&&e,n=o&&1===e.nodeType&&1===t.nodeType&&(~t.sourceIndex||1<<31)-(~e.sourceIndex||1<<31);if(n)return n;if(o)for(;o=o.nextSibling;)if(o===t)return-1;return e?1:-1}function me(e){return function(t){return"input"===t.nodeName.toLowerCase()&&t.type===e}}function le(e){return function(t){var o=t.nodeName.toLowerCase();return("input"===o||"button"===o)&&t.type===e}}function ue(e){return ie((function(t){return t=+t,ie((function(o,n){for(var a,i=e([],o.length,t),r=i.length;r--;)o[a=i[r]]&&(o[a]=!(n[a]=o[a]))}))}))}function de(e){return e&&void 0!==e.getElementsByTagName&&e}for(t in o=ne.support={},i=ne.isXML=function(e){var t=e&&(e.ownerDocument||e).documentElement;return!!t&&"HTML"!==t.nodeName},d=ne.setDocument=function(e){var t,a,r=e?e.ownerDocument||e:k;return r!==h&&9===r.nodeType&&r.documentElement?(p=(h=r).documentElement,g=!i(h),(a=h.defaultView)&&a.top!==a&&(a.addEventListener?a.addEventListener("unload",oe,!1):a.attachEvent&&a.attachEvent("onunload",oe)),o.attributes=re((function(e){return e.className="i",!e.getAttribute("className")})),o.getElementsByTagName=re((function(e){return e.appendChild(h.createComment("")),!e.getElementsByTagName("*").length})),o.getElementsByClassName=J.test(h.getElementsByClassName),o.getById=re((function(e){return p.appendChild(e).id=y,!h.getElementsByName||!h.getElementsByName(y).length})),o.getById?(n.find.ID=function(e,t){if(void 0!==t.getElementById&&g){var o=t.getElementById(e);return o?[o]:[]}},n.filter.ID=function(e){var t=e.replace(ee,te);return function(e){return e.getAttribute("id")===t}}):(delete n.find.ID,n.filter.ID=function(e){var t=e.replace(ee,te);return function(e){var o=void 0!==e.getAttributeNode&&e.getAttributeNode("id");return o&&o.value===t}}),n.find.TAG=o.getElementsByTagName?function(e,t){return void 0!==t.getElementsByTagName?t.getElementsByTagName(e):o.qsa?t.querySelectorAll(e):void 0}:function(e,t){var o,n=[],a=0,i=t.getElementsByTagName(e);if("*"===e){for(;o=i[a++];)1===o.nodeType&&n.push(o);return n}return i},n.find.CLASS=o.getElementsByClassName&&function(e,t){if(void 0!==t.getElementsByClassName&&g)return t.getElementsByClassName(e)},b=[],f=[],(o.qsa=J.test(h.querySelectorAll))&&(re((function(e){p.appendChild(e).innerHTML="<a id='"+y+"'></a><select id='"+y+"-\r\\' msallowcapture=''><option selected=''></option></select>",e.querySelectorAll("[msallowcapture^='']").length&&f.push("[*^$]="+G+"*(?:''|\"\")"),e.querySelectorAll("[selected]").length||f.push("\\["+G+"*(?:value|"+R+")"),e.querySelectorAll("[id~="+y+"-]").length||f.push("~="),e.querySelectorAll(":checked").length||f.push(":checked"),e.querySelectorAll("a#"+y+"+*").length||f.push(".#.+[+~]")})),re((function(e){var t=h.createElement("input");t.setAttribute("type","hidden"),e.appendChild(t).setAttribute("name","D"),e.querySelectorAll("[name=d]").length&&f.push("name"+G+"*[*^$|!~]?="),e.querySelectorAll(":enabled").length||f.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),f.push(",.*:")}))),(o.matchesSelector=J.test(v=p.matches||p.webkitMatchesSelector||p.mozMatchesSelector||p.oMatchesSelector||p.msMatchesSelector))&&re((function(e){o.disconnectedMatch=v.call(e,"div"),v.call(e,"[s!='']:x"),b.push("!=",H)})),f=f.length&&new RegExp(f.join("|")),b=b.length&&new RegExp(b.join("|")),t=J.test(p.compareDocumentPosition),w=t||J.test(p.contains)?function(e,t){var o=9===e.nodeType?e.documentElement:e,n=t&&t.parentNode;return e===n||!(!n||1!==n.nodeType||!(o.contains?o.contains(n):e.compareDocumentPosition&&16&e.compareDocumentPosition(n)))}:function(e,t){if(t)for(;t=t.parentNode;)if(t===e)return!0;return!1},D=t?function(e,t){if(e===t)return u=!0,0;var n=!e.compareDocumentPosition-!t.compareDocumentPosition;return n||(1&(n=(e.ownerDocument||e)===(t.ownerDocument||t)?e.compareDocumentPosition(t):1)||!o.sortDetached&&t.compareDocumentPosition(e)===n?e===h||e.ownerDocument===k&&w(k,e)?-1:t===h||t.ownerDocument===k&&w(k,t)?1:l?B(l,e)-B(l,t):0:4&n?-1:1)}:function(e,t){if(e===t)return u=!0,0;var o,n=0,a=e.parentNode,i=t.parentNode,r=[e],s=[t];if(!a||!i)return e===h?-1:t===h?1:a?-1:i?1:l?B(l,e)-B(l,t):0;if(a===i)return ce(e,t);for(o=e;o=o.parentNode;)r.unshift(o);for(o=t;o=o.parentNode;)s.unshift(o);for(;r[n]===s[n];)n++;return n?ce(r[n],s[n]):r[n]===k?-1:s[n]===k?1:0},h):h},ne.matches=function(e,t){return ne(e,null,null,t)},ne.matchesSelector=function(e,t){if((e.ownerDocument||e)!==h&&d(e),t=t.replace(L,"='$1']"),o.matchesSelector&&g&&!_[t+" "]&&(!b||!b.test(t))&&(!f||!f.test(t)))try{var n=v.call(e,t);if(n||o.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(e){}return ne(t,h,null,[e]).length>0},ne.contains=function(e,t){return(e.ownerDocument||e)!==h&&d(e),w(e,t)},ne.attr=function(e,t){(e.ownerDocument||e)!==h&&d(e);var a=n.attrHandle[t.toLowerCase()],i=a&&E.call(n.attrHandle,t.toLowerCase())?a(e,t,!g):void 0;return void 0!==i?i:o.attributes||!g?e.getAttribute(t):(i=e.getAttributeNode(t))&&i.specified?i.value:null},ne.error=function(e){throw new Error("Syntax error, unrecognized expression: "+e)},ne.uniqueSort=function(e){var t,n=[],a=0,i=0;if(u=!o.detectDuplicates,l=!o.sortStable&&e.slice(0),e.sort(D),u){for(;t=e[i++];)t===e[i]&&(a=n.push(i));for(;a--;)e.splice(n[a],1)}return l=null,e},a=ne.getText=function(e){var t,o="",n=0,i=e.nodeType;if(i){if(1===i||9===i||11===i){if("string"==typeof e.textContent)return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)o+=a(e)}else if(3===i||4===i)return e.nodeValue}else for(;t=e[n++];)o+=a(t);return o},(n=ne.selectors={cacheLength:50,createPseudo:ie,match:$,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(ee,te),e[3]=(e[3]||e[4]||e[5]||"").replace(ee,te),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||ne.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&ne.error(e[0]),e},PSEUDO:function(e){var t,o=!e[6]&&e[2];return $.CHILD.test(e[0])?null:(e[3]?e[2]=e[4]||e[5]||"":o&&U.test(o)&&(t=r(o,!0))&&(t=o.indexOf(")",o.length-t)-o.length)&&(e[0]=e[0].slice(0,t),e[2]=o.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(ee,te).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=x[e+" "];return t||(t=new RegExp("(^|"+G+")"+e+"("+G+"|$)"))&&x(e,(function(e){return t.test("string"==typeof e.className&&e.className||void 0!==e.getAttribute&&e.getAttribute("class")||"")}))},ATTR:function(e,t,o){return function(n){var a=ne.attr(n,e);return null==a?"!="===t:!t||(a+="","="===t?a===o:"!="===t?a!==o:"^="===t?o&&0===a.indexOf(o):"*="===t?o&&a.indexOf(o)>-1:"$="===t?o&&a.slice(-o.length)===o:"~="===t?(" "+a.replace(N," ")+" ").indexOf(o)>-1:"|="===t&&(a===o||a.slice(0,o.length+1)===o+"-"))}},CHILD:function(e,t,o,n,a){var i="nth"!==e.slice(0,3),r="last"!==e.slice(-4),s="of-type"===t;return 1===n&&0===a?function(e){return!!e.parentNode}:function(t,o,c){var m,l,u,d,h,p,g=i!==r?"nextSibling":"previousSibling",f=t.parentNode,b=s&&t.nodeName.toLowerCase(),v=!c&&!s,w=!1;if(f){if(i){for(;g;){for(d=t;d=d[g];)if(s?d.nodeName.toLowerCase()===b:1===d.nodeType)return!1;p=g="only"===e&&!p&&"nextSibling"}return!0}if(p=[r?f.firstChild:f.lastChild],r&&v){for(w=(h=(m=(l=(u=(d=f)[y]||(d[y]={}))[d.uniqueID]||(u[d.uniqueID]={}))[e]||[])[0]===C&&m[1])&&m[2],d=h&&f.childNodes[h];d=++h&&d&&d[g]||(w=h=0)||p.pop();)if(1===d.nodeType&&++w&&d===t){l[e]=[C,h,w];break}}else if(v&&(w=h=(m=(l=(u=(d=t)[y]||(d[y]={}))[d.uniqueID]||(u[d.uniqueID]={}))[e]||[])[0]===C&&m[1]),!1===w)for(;(d=++h&&d&&d[g]||(w=h=0)||p.pop())&&((s?d.nodeName.toLowerCase()!==b:1!==d.nodeType)||!++w||(v&&((l=(u=d[y]||(d[y]={}))[d.uniqueID]||(u[d.uniqueID]={}))[e]=[C,w]),d!==t)););return(w-=a)===n||w%n==0&&w/n>=0}}},PSEUDO:function(e,t){var o,a=n.pseudos[e]||n.setFilters[e.toLowerCase()]||ne.error("unsupported pseudo: "+e);return a[y]?a(t):a.length>1?(o=[e,e,"",t],n.setFilters.hasOwnProperty(e.toLowerCase())?ie((function(e,o){for(var n,i=a(e,t),r=i.length;r--;)e[n=B(e,i[r])]=!(o[n]=i[r])})):function(e){return a(e,0,o)}):a}},pseudos:{not:ie((function(e){var t=[],o=[],n=s(e.replace(I,"$1"));return n[y]?ie((function(e,t,o,a){for(var i,r=n(e,null,a,[]),s=e.length;s--;)(i=r[s])&&(e[s]=!(t[s]=i))})):function(e,a,i){return t[0]=e,n(t,null,i,o),t[0]=null,!o.pop()}})),has:ie((function(e){return function(t){return ne(e,t).length>0}})),contains:ie((function(e){return e=e.replace(ee,te),function(t){return(t.textContent||t.innerText||a(t)).indexOf(e)>-1}})),lang:ie((function(e){return W.test(e||"")||ne.error("unsupported lang: "+e),e=e.replace(ee,te).toLowerCase(),function(t){var o;do{if(o=g?t.lang:t.getAttribute("xml:lang")||t.getAttribute("lang"))return(o=o.toLowerCase())===e||0===o.indexOf(e+"-")}while((t=t.parentNode)&&1===t.nodeType);return!1}})),target:function(t){var o=e.location&&e.location.hash;return o&&o.slice(1)===t.id},root:function(e){return e===p},focus:function(e){return e===h.activeElement&&(!h.hasFocus||h.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:function(e){return!1===e.disabled},disabled:function(e){return!0===e.disabled},checked:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&!!e.checked||"option"===t&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,!0===e.selected},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeType<6)return!1;return!0},parent:function(e){return!n.pseudos.empty(e)},header:function(e){return K.test(e.nodeName)},input:function(e){return Q.test(e.nodeName)},button:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&"button"===e.type||"button"===t},text:function(e){var t;return"input"===e.nodeName.toLowerCase()&&"text"===e.type&&(null==(t=e.getAttribute("type"))||"text"===t.toLowerCase())},first:ue((function(){return[0]})),last:ue((function(e,t){return[t-1]})),eq:ue((function(e,t,o){return[o<0?o+t:o]})),even:ue((function(e,t){for(var o=0;o<t;o+=2)e.push(o);return e})),odd:ue((function(e,t){for(var o=1;o<t;o+=2)e.push(o);return e})),lt:ue((function(e,t,o){for(var n=o<0?o+t:o;--n>=0;)e.push(n);return e})),gt:ue((function(e,t,o){for(var n=o<0?o+t:o;++n<t;)e.push(n);return e}))}}).pseudos.nth=n.pseudos.eq,{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})n.pseudos[t]=me(t);for(t in{submit:!0,reset:!0})n.pseudos[t]=le(t);function he(){}function pe(e){for(var t=0,o=e.length,n="";t<o;t++)n+=e[t].value;return n}function ge(e,t,o){var n=t.dir,a=o&&"parentNode"===n,i=A++;return t.first?function(t,o,i){for(;t=t[n];)if(1===t.nodeType||a)return e(t,o,i)}:function(t,o,r){var s,c,m,l=[C,i];if(r){for(;t=t[n];)if((1===t.nodeType||a)&&e(t,o,r))return!0}else for(;t=t[n];)if(1===t.nodeType||a){if((s=(c=(m=t[y]||(t[y]={}))[t.uniqueID]||(m[t.uniqueID]={}))[n])&&s[0]===C&&s[1]===i)return l[2]=s[2];if(c[n]=l,l[2]=e(t,o,r))return!0}}}function fe(e){return e.length>1?function(t,o,n){for(var a=e.length;a--;)if(!e[a](t,o,n))return!1;return!0}:e[0]}function be(e,t,o,n,a){for(var i,r=[],s=0,c=e.length,m=null!=t;s<c;s++)(i=e[s])&&(o&&!o(i,n,a)||(r.push(i),m&&t.push(s)));return r}function ve(e,t,o,n,a,i){return n&&!n[y]&&(n=ve(n)),a&&!a[y]&&(a=ve(a,i)),ie((function(i,r,s,c){var m,l,u,d=[],h=[],p=r.length,g=i||function(e,t,o){for(var n=0,a=t.length;n<a;n++)ne(e,t[n],o);return o}(t||"*",s.nodeType?[s]:s,[]),f=!e||!i&&t?g:be(g,d,e,s,c),b=o?a||(i?e:p||n)?[]:r:f;if(o&&o(f,b,s,c),n)for(m=be(b,h),n(m,[],s,c),l=m.length;l--;)(u=m[l])&&(b[h[l]]=!(f[h[l]]=u));if(i){if(a||e){if(a){for(m=[],l=b.length;l--;)(u=b[l])&&m.push(f[l]=u);a(null,b=[],m,c)}for(l=b.length;l--;)(u=b[l])&&(m=a?B(i,u):d[l])>-1&&(i[m]=!(r[m]=u))}}else b=be(b===r?b.splice(p,b.length):b),a?a(null,r,b,c):z.apply(r,b)}))}function we(e){for(var t,o,a,i=e.length,r=n.relative[e[0].type],s=r||n.relative[" "],c=r?1:0,l=ge((function(e){return e===t}),s,!0),u=ge((function(e){return B(t,e)>-1}),s,!0),d=[function(e,o,n){var a=!r&&(n||o!==m)||((t=o).nodeType?l(e,o,n):u(e,o,n));return t=null,a}];c<i;c++)if(o=n.relative[e[c].type])d=[ge(fe(d),o)];else{if((o=n.filter[e[c].type].apply(null,e[c].matches))[y]){for(a=++c;a<i&&!n.relative[e[a].type];a++);return ve(c>1&&fe(d),c>1&&pe(e.slice(0,c-1).concat({value:" "===e[c-2].type?"*":""})).replace(I,"$1"),o,c<a&&we(e.slice(c,a)),a<i&&we(e=e.slice(a)),a<i&&pe(e))}d.push(o)}return fe(d)}return he.prototype=n.filters=n.pseudos,n.setFilters=new he,r=ne.tokenize=function(e,t){var o,a,i,r,s,c,m,l=M[e+" "];if(l)return t?0:l.slice(0);for(s=e,c=[],m=n.preFilter;s;){for(r in o&&!(a=P.exec(s))||(a&&(s=s.slice(a[0].length)||s),c.push(i=[])),o=!1,(a=O.exec(s))&&(o=a.shift(),i.push({value:o,type:a[0].replace(I," ")}),s=s.slice(o.length)),n.filter)!(a=$[r].exec(s))||m[r]&&!(a=m[r](a))||(o=a.shift(),i.push({value:o,type:r,matches:a}),s=s.slice(o.length));if(!o)break}return t?s.length:s?ne.error(e):M(e,c).slice(0)},s=ne.compile=function(e,t){var o,a=[],i=[],s=_[e+" "];if(!s){for(t||(t=r(e)),o=t.length;o--;)(s=we(t[o]))[y]?a.push(s):i.push(s);(s=_(e,function(e,t){var o=t.length>0,a=e.length>0,i=function(i,r,s,c,l){var u,p,f,b=0,v="0",w=i&&[],y=[],k=m,A=i||a&&n.find.TAG("*",l),x=C+=null==k?1:Math.random()||.1,M=A.length;for(l&&(m=r===h||r||l);v!==M&&null!=(u=A[v]);v++){if(a&&u){for(p=0,r||u.ownerDocument===h||(d(u),s=!g);f=e[p++];)if(f(u,r||h,s)){c.push(u);break}l&&(C=x)}o&&((u=!f&&u)&&b--,i&&w.push(u))}if(b+=v,o&&v!==b){for(p=0;f=t[p++];)f(w,y,r,s);if(i){if(b>0)for(;v--;)w[v]||y[v]||(y[v]=q.call(c));y=be(y)}z.apply(c,y),l&&!i&&y.length>0&&b+t.length>1&&ne.uniqueSort(c)}return l&&(C=x,m=k),w};return o?ie(i):i}(i,a))).selector=e}return s},c=ne.select=function(e,t,a,i){var c,m,l,u,d,h="function"==typeof e&&e,p=!i&&r(e=h.selector||e);if(a=a||[],1===p.length){if((m=p[0]=p[0].slice(0)).length>2&&"ID"===(l=m[0]).type&&o.getById&&9===t.nodeType&&g&&n.relative[m[1].type]){if(!(t=(n.find.ID(l.matches[0].replace(ee,te),t)||[])[0]))return a;h&&(t=t.parentNode),e=e.slice(m.shift().value.length)}for(c=$.needsContext.test(e)?0:m.length;c--&&(l=m[c],!n.relative[u=l.type]);)if((d=n.find[u])&&(i=d(l.matches[0].replace(ee,te),Z.test(m[0].type)&&de(t.parentNode)||t))){if(m.splice(c,1),!(e=i.length&&pe(m)))return z.apply(a,i),a;break}}return(h||s(e,p))(i,t,!g,a,!t||Z.test(e)&&de(t.parentNode)||t),a},o.sortStable=y.split("").sort(D).join("")===y,o.detectDuplicates=!!u,d(),o.sortDetached=re((function(e){return 1&e.compareDocumentPosition(h.createElement("div"))})),re((function(e){return e.innerHTML="<a href='#'></a>","#"===e.firstChild.getAttribute("href")}))||se("type|href|height|width",(function(e,t,o){if(!o)return e.getAttribute(t,"type"===t.toLowerCase()?1:2)})),o.attributes&&re((function(e){return e.innerHTML="<input/>",e.firstChild.setAttribute("value",""),""===e.firstChild.getAttribute("value")}))||se("value",(function(e,t,o){if(!o&&"input"===e.nodeName.toLowerCase())return e.defaultValue})),re((function(e){return null==e.getAttribute("disabled")}))||se(R,(function(e,t,o){var n;if(!o)return!0===e[t]?t.toLowerCase():(n=e.getAttributeNode(t))&&n.specified?n.value:null})),ne}(e);d.find=v,d.expr=v.selectors,d.expr[":"]=d.expr.pseudos,d.uniqueSort=d.unique=v.uniqueSort,d.text=v.getText,d.isXMLDoc=v.isXML,d.contains=v.contains;var w=function(e,t,o){for(var n=[],a=void 0!==o;(e=e[t])&&9!==e.nodeType;)if(1===e.nodeType){if(a&&d(e).is(o))break;n.push(e)}return n},y=function(e,t){for(var o=[];e;e=e.nextSibling)1===e.nodeType&&e!==t&&o.push(e);return o},k=d.expr.match.needsContext,C=/^<([\w-]+)\s*\/?>(?:<\/\1>|)$/,A=/^.[^:#\[\.,]*$/;function x(e,t,o){if(d.isFunction(t))return d.grep(e,(function(e,n){return!!t.call(e,n,e)!==o}));if(t.nodeType)return d.grep(e,(function(e){return e===t!==o}));if("string"==typeof t){if(A.test(t))return d.filter(t,e,o);t=d.filter(t,e)}return d.grep(e,(function(e){return d.inArray(e,t)>-1!==o}))}d.filter=function(e,t,o){var n=t[0];return o&&(e=":not("+e+")"),1===t.length&&1===n.nodeType?d.find.matchesSelector(n,e)?[n]:[]:d.find.matches(e,d.grep(t,(function(e){return 1===e.nodeType})))},d.fn.extend({find:function(e){var t,o=[],n=this,a=n.length;if("string"!=typeof e)return this.pushStack(d(e).filter((function(){for(t=0;t<a;t++)if(d.contains(n[t],this))return!0})));for(t=0;t<a;t++)d.find(e,n[t],o);return(o=this.pushStack(a>1?d.unique(o):o)).selector=this.selector?this.selector+" "+e:e,o},filter:function(e){return this.pushStack(x(this,e||[],!1))},not:function(e){return this.pushStack(x(this,e||[],!0))},is:function(e){return!!x(this,"string"==typeof e&&k.test(e)?d(e):e||[],!1).length}});var M,_=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/;(d.fn.init=function(e,t,o){var a,i;if(!e)return this;if(o=o||M,"string"==typeof e){if(!(a="<"===e.charAt(0)&&">"===e.charAt(e.length-1)&&e.length>=3?[null,e,null]:_.exec(e))||!a[1]&&t)return!t||t.jquery?(t||o).find(e):this.constructor(t).find(e);if(a[1]){if(t=t instanceof d?t[0]:t,d.merge(this,d.parseHTML(a[1],t&&t.nodeType?t.ownerDocument||t:n,!0)),C.test(a[1])&&d.isPlainObject(t))for(a in t)d.isFunction(this[a])?this[a](t[a]):this.attr(a,t[a]);return this}if((i=n.getElementById(a[2]))&&i.parentNode){if(i.id!==a[2])return M.find(e);this.length=1,this[0]=i}return this.context=n,this.selector=e,this}return e.nodeType?(this.context=this[0]=e,this.length=1,this):d.isFunction(e)?void 0!==o.ready?o.ready(e):e(d):(void 0!==e.selector&&(this.selector=e.selector,this.context=e.context),d.makeArray(e,this))}).prototype=d.fn,M=d(n);var D=/^(?:parents|prev(?:Until|All))/,E={children:!0,contents:!0,next:!0,prev:!0};function T(e,t){do{e=e[t]}while(e&&1!==e.nodeType);return e}d.fn.extend({has:function(e){var t,o=d(e,this),n=o.length;return this.filter((function(){for(t=0;t<n;t++)if(d.contains(this,o[t]))return!0}))},closest:function(e,t){for(var o,n=0,a=this.length,i=[],r=k.test(e)||"string"!=typeof e?d(e,t||this.context):0;n<a;n++)for(o=this[n];o&&o!==t;o=o.parentNode)if(o.nodeType<11&&(r?r.index(o)>-1:1===o.nodeType&&d.find.matchesSelector(o,e))){i.push(o);break}return this.pushStack(i.length>1?d.uniqueSort(i):i)},index:function(e){return e?"string"==typeof e?d.inArray(this[0],d(e)):d.inArray(e.jquery?e[0]:e,this):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(e,t){return this.pushStack(d.uniqueSort(d.merge(this.get(),d(e,t))))},addBack:function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}}),d.each({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return w(e,"parentNode")},parentsUntil:function(e,t,o){return w(e,"parentNode",o)},next:function(e){return T(e,"nextSibling")},prev:function(e){return T(e,"previousSibling")},nextAll:function(e){return w(e,"nextSibling")},prevAll:function(e){return w(e,"previousSibling")},nextUntil:function(e,t,o){return w(e,"nextSibling",o)},prevUntil:function(e,t,o){return w(e,"previousSibling",o)},siblings:function(e){return y((e.parentNode||{}).firstChild,e)},children:function(e){return y(e.firstChild)},contents:function(e){return d.nodeName(e,"iframe")?e.contentDocument||e.contentWindow.document:d.merge([],e.childNodes)}},(function(e,t){d.fn[e]=function(o,n){var a=d.map(this,t,o);return"Until"!==e.slice(-5)&&(n=o),n&&"string"==typeof n&&(a=d.filter(n,a)),this.length>1&&(E[e]||(a=d.uniqueSort(a)),D.test(e)&&(a=a.reverse())),this.pushStack(a)}}));var q,S,z=/\S+/g;function V(){n.addEventListener?(n.removeEventListener("DOMContentLoaded",B),e.removeEventListener("load",B)):(n.detachEvent("onreadystatechange",B),e.detachEvent("onload",B))}function B(){(n.addEventListener||"load"===e.event.type||"complete"===n.readyState)&&(V(),d.ready())}for(S in d.Callbacks=function(e){e="string"==typeof e?function(e){var t={};return d.each(e.match(z)||[],(function(e,o){t[o]=!0})),t}(e):d.extend({},e);var t,o,n,a,i=[],r=[],s=-1,c=function(){for(a=e.once,n=t=!0;r.length;s=-1)for(o=r.shift();++s<i.length;)!1===i[s].apply(o[0],o[1])&&e.stopOnFalse&&(s=i.length,o=!1);e.memory||(o=!1),t=!1,a&&(i=o?[]:"")},m={add:function(){return i&&(o&&!t&&(s=i.length-1,r.push(o)),function t(o){d.each(o,(function(o,n){d.isFunction(n)?e.unique&&m.has(n)||i.push(n):n&&n.length&&"string"!==d.type(n)&&t(n)}))}(arguments),o&&!t&&c()),this},remove:function(){return d.each(arguments,(function(e,t){for(var o;(o=d.inArray(t,i,o))>-1;)i.splice(o,1),o<=s&&s--})),this},has:function(e){return e?d.inArray(e,i)>-1:i.length>0},empty:function(){return i&&(i=[]),this},disable:function(){return a=r=[],i=o="",this},disabled:function(){return!i},lock:function(){return a=!0,o||m.disable(),this},locked:function(){return!!a},fireWith:function(e,o){return a||(o=[e,(o=o||[]).slice?o.slice():o],r.push(o),t||c()),this},fire:function(){return m.fireWith(this,arguments),this},fired:function(){return!!n}};return m},d.extend({Deferred:function(e){var t=[["resolve","done",d.Callbacks("once memory"),"resolved"],["reject","fail",d.Callbacks("once memory"),"rejected"],["notify","progress",d.Callbacks("memory")]],o="pending",n={state:function(){return o},always:function(){return a.done(arguments).fail(arguments),this},then:function(){var e=arguments;return d.Deferred((function(o){d.each(t,(function(t,i){var r=d.isFunction(e[t])&&e[t];a[i[1]]((function(){var e=r&&r.apply(this,arguments);e&&d.isFunction(e.promise)?e.promise().progress(o.notify).done(o.resolve).fail(o.reject):o[i[0]+"With"](this===n?o.promise():this,r?[e]:arguments)}))})),e=null})).promise()},promise:function(e){return null!=e?d.extend(e,n):n}},a={};return n.pipe=n.then,d.each(t,(function(e,i){var r=i[2],s=i[3];n[i[1]]=r.add,s&&r.add((function(){o=s}),t[1^e][2].disable,t[2][2].lock),a[i[0]]=function(){return a[i[0]+"With"](this===a?n:this,arguments),this},a[i[0]+"With"]=r.fireWith})),n.promise(a),e&&e.call(a,a),a},when:function(e){var t,o,n,i=0,r=a.call(arguments),s=r.length,c=1!==s||e&&d.isFunction(e.promise)?s:0,m=1===c?e:d.Deferred(),l=function(e,o,n){return function(i){o[e]=this,n[e]=arguments.length>1?a.call(arguments):i,n===t?m.notifyWith(o,n):--c||m.resolveWith(o,n)}};if(s>1)for(t=new Array(s),o=new Array(s),n=new Array(s);i<s;i++)r[i]&&d.isFunction(r[i].promise)?r[i].promise().progress(l(i,o,t)).done(l(i,n,r)).fail(m.reject):--c;return c||m.resolveWith(n,r),m.promise()}}),d.fn.ready=function(e){return d.ready.promise().done(e),this},d.extend({isReady:!1,readyWait:1,holdReady:function(e){e?d.readyWait++:d.ready(!0)},ready:function(e){(!0===e?--d.readyWait:d.isReady)||(d.isReady=!0,!0!==e&&--d.readyWait>0||(q.resolveWith(n,[d]),d.fn.triggerHandler&&(d(n).triggerHandler("ready"),d(n).off("ready"))))}}),d.ready.promise=function(t){if(!q)if(q=d.Deferred(),"complete"===n.readyState||"loading"!==n.readyState&&!n.documentElement.doScroll)e.setTimeout(d.ready);else if(n.addEventListener)n.addEventListener("DOMContentLoaded",B),e.addEventListener("load",B);else{n.attachEvent("onreadystatechange",B),e.attachEvent("onload",B);var o=!1;try{o=null==e.frameElement&&n.documentElement}catch(e){}o&&o.doScroll&&function t(){if(!d.isReady){try{o.doScroll("left")}catch(o){return e.setTimeout(t,50)}V(),d.ready()}}()}return q.promise(t)},d.ready.promise(),d(u))break;u.ownFirst="0"===S,u.inlineBlockNeedsLayout=!1,d((function(){var e,t,o,a;(o=n.getElementsByTagName("body")[0])&&o.style&&(t=n.createElement("div"),(a=n.createElement("div")).style.cssText="position:absolute;border:0;width:0;height:0;top:0;left:-9999px",o.appendChild(a).appendChild(t),void 0!==t.style.zoom&&(t.style.cssText="display:inline;margin:0;border:0;padding:1px;width:1px;zoom:1",u.inlineBlockNeedsLayout=e=3===t.offsetWidth,e&&(o.style.zoom=1)),o.removeChild(a))})),function(){var e=n.createElement("div");u.deleteExpando=!0;try{delete e.test}catch(e){u.deleteExpando=!1}e=null}();var R,G=function(e){var t=d.noData[(e.nodeName+" ").toLowerCase()],o=+e.nodeType||1;return(1===o||9===o)&&(!t||!0!==t&&e.getAttribute("classid")===t)},j=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,F=/([A-Z])/g;function H(e,t,o){if(void 0===o&&1===e.nodeType){var n="data-"+t.replace(F,"-$1").toLowerCase();if("string"==typeof(o=e.getAttribute(n))){try{o="true"===o||"false"!==o&&("null"===o?null:+o+""===o?+o:j.test(o)?d.parseJSON(o):o)}catch(e){}d.data(e,t,o)}else o=void 0}return o}function N(e){var t;for(t in e)if(("data"!==t||!d.isEmptyObject(e[t]))&&"toJSON"!==t)return!1;return!0}function I(e,t,n,a){if(G(e)){var i,r,s=d.expando,c=e.nodeType,m=c?d.cache:e,l=c?e[s]:e[s]&&s;if(l&&m[l]&&(a||m[l].data)||void 0!==n||"string"!=typeof t)return l||(l=c?e[s]=o.pop()||d.guid++:s),m[l]||(m[l]=c?{}:{toJSON:d.noop}),"object"!=typeof t&&"function"!=typeof t||(a?m[l]=d.extend(m[l],t):m[l].data=d.extend(m[l].data,t)),r=m[l],a||(r.data||(r.data={}),r=r.data),void 0!==n&&(r[d.camelCase(t)]=n),"string"==typeof t?null==(i=r[t])&&(i=r[d.camelCase(t)]):i=r,i}}function P(e,t,o){if(G(e)){var n,a,i=e.nodeType,r=i?d.cache:e,s=i?e[d.expando]:d.expando;if(r[s]){if(t&&(n=o?r[s]:r[s].data)){a=(t=d.isArray(t)?t.concat(d.map(t,d.camelCase)):t in n||(t=d.camelCase(t))in n?[t]:t.split(" ")).length;for(;a--;)delete n[t[a]];if(o?!N(n):!d.isEmptyObject(n))return}(o||(delete r[s].data,N(r[s])))&&(i?d.cleanData([e],!0):u.deleteExpando||r!=r.window?delete r[s]:r[s]=void 0)}}}d.extend({cache:{},noData:{"applet ":!0,"embed ":!0,"object ":"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"},hasData:function(e){return!!(e=e.nodeType?d.cache[e[d.expando]]:e[d.expando])&&!N(e)},data:function(e,t,o){return I(e,t,o)},removeData:function(e,t){return P(e,t)},_data:function(e,t,o){return I(e,t,o,!0)},_removeData:function(e,t){return P(e,t,!0)}}),d.fn.extend({data:function(e,t){var o,n,a,i=this[0],r=i&&i.attributes;if(void 0===e){if(this.length&&(a=d.data(i),1===i.nodeType&&!d._data(i,"parsedAttrs"))){for(o=r.length;o--;)r[o]&&0===(n=r[o].name).indexOf("data-")&&H(i,n=d.camelCase(n.slice(5)),a[n]);d._data(i,"parsedAttrs",!0)}return a}return"object"==typeof e?this.each((function(){d.data(this,e)})):arguments.length>1?this.each((function(){d.data(this,e,t)})):i?H(i,e,d.data(i,e)):void 0},removeData:function(e){return this.each((function(){d.removeData(this,e)}))}}),d.extend({queue:function(e,t,o){var n;if(e)return t=(t||"fx")+"queue",n=d._data(e,t),o&&(!n||d.isArray(o)?n=d._data(e,t,d.makeArray(o)):n.push(o)),n||[]},dequeue:function(e,t){t=t||"fx";var o=d.queue(e,t),n=o.length,a=o.shift(),i=d._queueHooks(e,t);"inprogress"===a&&(a=o.shift(),n--),a&&("fx"===t&&o.unshift("inprogress"),delete i.stop,a.call(e,(function(){d.dequeue(e,t)}),i)),!n&&i&&i.empty.fire()},_queueHooks:function(e,t){var o=t+"queueHooks";return d._data(e,o)||d._data(e,o,{empty:d.Callbacks("once memory").add((function(){d._removeData(e,t+"queue"),d._removeData(e,o)}))})}}),d.fn.extend({queue:function(e,t){var o=2;return"string"!=typeof e&&(t=e,e="fx",o--),arguments.length<o?d.queue(this[0],e):void 0===t?this:this.each((function(){var o=d.queue(this,e,t);d._queueHooks(this,e),"fx"===e&&"inprogress"!==o[0]&&d.dequeue(this,e)}))},dequeue:function(e){return this.each((function(){d.dequeue(this,e)}))},clearQueue:function(e){return this.queue(e||"fx",[])},promise:function(e,t){var o,n=1,a=d.Deferred(),i=this,r=this.length,s=function(){--n||a.resolveWith(i,[i])};for("string"!=typeof e&&(t=e,e=void 0),e=e||"fx";r--;)(o=d._data(i[r],e+"queueHooks"))&&o.empty&&(n++,o.empty.add(s));return s(),a.promise(t)}}),u.shrinkWrapBlocks=function(){return null!=R?R:(R=!1,(t=n.getElementsByTagName("body")[0])&&t.style?(e=n.createElement("div"),(o=n.createElement("div")).style.cssText="position:absolute;border:0;width:0;height:0;top:0;left:-9999px",t.appendChild(o).appendChild(e),void 0!==e.style.zoom&&(e.style.cssText="-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;display:block;margin:0;border:0;padding:1px;width:1px;zoom:1",e.appendChild(n.createElement("div")).style.width="5px",R=3!==e.offsetWidth),t.removeChild(o),R):void 0);var e,t,o};var O=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,L=new RegExp("^(?:([+-])=|)("+O+")([a-z%]*)$","i"),U=["Top","Right","Bottom","Left"],W=function(e,t){return e=t||e,"none"===d.css(e,"display")||!d.contains(e.ownerDocument,e)};function $(e,t,o,n){var a,i=1,r=20,s=n?function(){return n.cur()}:function(){return d.css(e,t,"")},c=s(),m=o&&o[3]||(d.cssNumber[t]?"":"px"),l=(d.cssNumber[t]||"px"!==m&&+c)&&L.exec(d.css(e,t));if(l&&l[3]!==m){m=m||l[3],o=o||[],l=+c||1;do{l/=i=i||".5",d.style(e,t,l+m)}while(i!==(i=s()/c)&&1!==i&&--r)}return o&&(l=+l||+c||0,a=o[1]?l+(o[1]+1)*o[2]:+o[2],n&&(n.unit=m,n.start=l,n.end=a)),a}var Q,K,J,Y=function(e,t,o,n,a,i,r){var s=0,c=e.length,m=null==o;if("object"===d.type(o))for(s in a=!0,o)Y(e,t,s,o[s],!0,i,r);else if(void 0!==n&&(a=!0,d.isFunction(n)||(r=!0),m&&(r?(t.call(e,n),t=null):(m=t,t=function(e,t,o){return m.call(d(e),o)})),t))for(;s<c;s++)t(e[s],o,r?n:n.call(e[s],s,t(e[s],o)));return a?e:m?t.call(e):c?t(e[0],o):i},Z=/^(?:checkbox|radio)$/i,X=/<([\w:-]+)/,ee=/^$|\/(?:java|ecma)script/i,te=/^\s+/,oe="abbr|article|aside|audio|bdi|canvas|data|datalist|details|dialog|figcaption|figure|footer|header|hgroup|main|mark|meter|nav|output|picture|progress|section|summary|template|time|video";function ne(e){var t=oe.split("|"),o=e.createDocumentFragment();if(o.createElement)for(;t.length;)o.createElement(t.pop());return o}Q=n.createElement("div"),K=n.createDocumentFragment(),J=n.createElement("input"),Q.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",u.leadingWhitespace=3===Q.firstChild.nodeType,u.tbody=!Q.getElementsByTagName("tbody").length,u.htmlSerialize=!!Q.getElementsByTagName("link").length,u.html5Clone="<:nav></:nav>"!==n.createElement("nav").cloneNode(!0).outerHTML,J.type="checkbox",J.checked=!0,K.appendChild(J),u.appendChecked=J.checked,Q.innerHTML="<textarea>x</textarea>",u.noCloneChecked=!!Q.cloneNode(!0).lastChild.defaultValue,K.appendChild(Q),(J=n.createElement("input")).setAttribute("type","radio"),J.setAttribute("checked","checked"),J.setAttribute("name","t"),Q.appendChild(J),u.checkClone=Q.cloneNode(!0).cloneNode(!0).lastChild.checked,u.noCloneEvent=!!Q.addEventListener,Q[d.expando]=1,u.attributes=!Q.getAttribute(d.expando);var ae={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],area:[1,"<map>","</map>"],param:[1,"<object>","</object>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:u.htmlSerialize?[0,"",""]:[1,"X<div>","</div>"]};function ie(e,t){var o,n,a=0,i=void 0!==e.getElementsByTagName?e.getElementsByTagName(t||"*"):void 0!==e.querySelectorAll?e.querySelectorAll(t||"*"):void 0;if(!i)for(i=[],o=e.childNodes||e;null!=(n=o[a]);a++)!t||d.nodeName(n,t)?i.push(n):d.merge(i,ie(n,t));return void 0===t||t&&d.nodeName(e,t)?d.merge([e],i):i}function re(e,t){for(var o,n=0;null!=(o=e[n]);n++)d._data(o,"globalEval",!t||d._data(t[n],"globalEval"))}ae.optgroup=ae.option,ae.tbody=ae.tfoot=ae.colgroup=ae.caption=ae.thead,ae.th=ae.td;var se=/<|&#?\w+;/,ce=/<tbody/i;function me(e){Z.test(e.type)&&(e.defaultChecked=e.checked)}function le(e,t,o,n,a){for(var i,r,s,c,m,l,h,p=e.length,g=ne(t),f=[],b=0;b<p;b++)if((r=e[b])||0===r)if("object"===d.type(r))d.merge(f,r.nodeType?[r]:r);else if(se.test(r)){for(c=c||g.appendChild(t.createElement("div")),m=(X.exec(r)||["",""])[1].toLowerCase(),h=ae[m]||ae._default,c.innerHTML=h[1]+d.htmlPrefilter(r)+h[2],i=h[0];i--;)c=c.lastChild;if(!u.leadingWhitespace&&te.test(r)&&f.push(t.createTextNode(te.exec(r)[0])),!u.tbody)for(i=(r="table"!==m||ce.test(r)?"<table>"!==h[1]||ce.test(r)?0:c:c.firstChild)&&r.childNodes.length;i--;)d.nodeName(l=r.childNodes[i],"tbody")&&!l.childNodes.length&&r.removeChild(l);for(d.merge(f,c.childNodes),c.textContent="";c.firstChild;)c.removeChild(c.firstChild);c=g.lastChild}else f.push(t.createTextNode(r));for(c&&g.removeChild(c),u.appendChecked||d.grep(ie(f,"input"),me),b=0;r=f[b++];)if(n&&d.inArray(r,n)>-1)a&&a.push(r);else if(s=d.contains(r.ownerDocument,r),c=ie(g.appendChild(r),"script"),s&&re(c),o)for(i=0;r=c[i++];)ee.test(r.type||"")&&o.push(r);return c=null,g}!function(){var t,o,a=n.createElement("div");for(t in{submit:!0,change:!0,focusin:!0})o="on"+t,(u[t]=o in e)||(a.setAttribute(o,"t"),u[t]=!1===a.attributes[o].expando);a=null}();var ue=/^(?:input|select|textarea)$/i,de=/^key/,he=/^(?:mouse|pointer|contextmenu|drag|drop)|click/,pe=/^(?:focusinfocus|focusoutblur)$/,ge=/^([^.]*)(?:\.(.+)|)/;function fe(){return!0}function be(){return!1}function ve(){try{return n.activeElement}catch(e){}}function we(e,t,o,n,a,i){var r,s;if("object"==typeof t){for(s in"string"!=typeof o&&(n=n||o,o=void 0),t)we(e,s,o,n,t[s],i);return e}if(null==n&&null==a?(a=o,n=o=void 0):null==a&&("string"==typeof o?(a=n,n=void 0):(a=n,n=o,o=void 0)),!1===a)a=be;else if(!a)return e;return 1===i&&(r=a,(a=function(e){return d().off(e),r.apply(this,arguments)}).guid=r.guid||(r.guid=d.guid++)),e.each((function(){d.event.add(this,t,a,n,o)}))}d.event={global:{},add:function(e,t,o,n,a){var i,r,s,c,m,l,u,h,p,g,f,b=d._data(e);if(b){for(o.handler&&(o=(c=o).handler,a=c.selector),o.guid||(o.guid=d.guid++),(r=b.events)||(r=b.events={}),(l=b.handle)||((l=b.handle=function(e){return void 0===d||e&&d.event.triggered===e.type?void 0:d.event.dispatch.apply(l.elem,arguments)}).elem=e),s=(t=(t||"").match(z)||[""]).length;s--;)p=f=(i=ge.exec(t[s])||[])[1],g=(i[2]||"").split(".").sort(),p&&(m=d.event.special[p]||{},p=(a?m.delegateType:m.bindType)||p,m=d.event.special[p]||{},u=d.extend({type:p,origType:f,data:n,handler:o,guid:o.guid,selector:a,needsContext:a&&d.expr.match.needsContext.test(a),namespace:g.join(".")},c),(h=r[p])||((h=r[p]=[]).delegateCount=0,m.setup&&!1!==m.setup.call(e,n,g,l)||(e.addEventListener?e.addEventListener(p,l,!1):e.attachEvent&&e.attachEvent("on"+p,l))),m.add&&(m.add.call(e,u),u.handler.guid||(u.handler.guid=o.guid)),a?h.splice(h.delegateCount++,0,u):h.push(u),d.event.global[p]=!0);e=null}},remove:function(e,t,o,n,a){var i,r,s,c,m,l,u,h,p,g,f,b=d.hasData(e)&&d._data(e);if(b&&(l=b.events)){for(m=(t=(t||"").match(z)||[""]).length;m--;)if(p=f=(s=ge.exec(t[m])||[])[1],g=(s[2]||"").split(".").sort(),p){for(u=d.event.special[p]||{},h=l[p=(n?u.delegateType:u.bindType)||p]||[],s=s[2]&&new RegExp("(^|\\.)"+g.join("\\.(?:.*\\.|)")+"(\\.|$)"),c=i=h.length;i--;)r=h[i],!a&&f!==r.origType||o&&o.guid!==r.guid||s&&!s.test(r.namespace)||n&&n!==r.selector&&("**"!==n||!r.selector)||(h.splice(i,1),r.selector&&h.delegateCount--,u.remove&&u.remove.call(e,r));c&&!h.length&&(u.teardown&&!1!==u.teardown.call(e,g,b.handle)||d.removeEvent(e,p,b.handle),delete l[p])}else for(p in l)d.event.remove(e,p+t[m],o,n,!0);d.isEmptyObject(l)&&(delete b.handle,d._removeData(e,"events"))}},trigger:function(t,o,a,i){var r,s,c,m,u,h,p,g=[a||n],f=l.call(t,"type")?t.type:t,b=l.call(t,"namespace")?t.namespace.split("."):[];if(c=h=a=a||n,3!==a.nodeType&&8!==a.nodeType&&!pe.test(f+d.event.triggered)&&(f.indexOf(".")>-1&&(b=f.split("."),f=b.shift(),b.sort()),s=f.indexOf(":")<0&&"on"+f,(t=t[d.expando]?t:new d.Event(f,"object"==typeof t&&t)).isTrigger=i?2:3,t.namespace=b.join("."),t.rnamespace=t.namespace?new RegExp("(^|\\.)"+b.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,t.result=void 0,t.target||(t.target=a),o=null==o?[t]:d.makeArray(o,[t]),u=d.event.special[f]||{},i||!u.trigger||!1!==u.trigger.apply(a,o))){if(!i&&!u.noBubble&&!d.isWindow(a)){for(m=u.delegateType||f,pe.test(m+f)||(c=c.parentNode);c;c=c.parentNode)g.push(c),h=c;h===(a.ownerDocument||n)&&g.push(h.defaultView||h.parentWindow||e)}for(p=0;(c=g[p++])&&!t.isPropagationStopped();)t.type=p>1?m:u.bindType||f,(r=(d._data(c,"events")||{})[t.type]&&d._data(c,"handle"))&&r.apply(c,o),(r=s&&c[s])&&r.apply&&G(c)&&(t.result=r.apply(c,o),!1===t.result&&t.preventDefault());if(t.type=f,!i&&!t.isDefaultPrevented()&&(!u._default||!1===u._default.apply(g.pop(),o))&&G(a)&&s&&a[f]&&!d.isWindow(a)){(h=a[s])&&(a[s]=null),d.event.triggered=f;try{a[f]()}catch(e){}d.event.triggered=void 0,h&&(a[s]=h)}return t.result}},dispatch:function(e){e=d.event.fix(e);var t,o,n,i,r,s=[],c=a.call(arguments),m=(d._data(this,"events")||{})[e.type]||[],l=d.event.special[e.type]||{};if(c[0]=e,e.delegateTarget=this,!l.preDispatch||!1!==l.preDispatch.call(this,e)){for(s=d.event.handlers.call(this,e,m),t=0;(i=s[t++])&&!e.isPropagationStopped();)for(e.currentTarget=i.elem,o=0;(r=i.handlers[o++])&&!e.isImmediatePropagationStopped();)e.rnamespace&&!e.rnamespace.test(r.namespace)||(e.handleObj=r,e.data=r.data,void 0!==(n=((d.event.special[r.origType]||{}).handle||r.handler).apply(i.elem,c))&&!1===(e.result=n)&&(e.preventDefault(),e.stopPropagation()));return l.postDispatch&&l.postDispatch.call(this,e),e.result}},handlers:function(e,t){var o,n,a,i,r=[],s=t.delegateCount,c=e.target;if(s&&c.nodeType&&("click"!==e.type||isNaN(e.button)||e.button<1))for(;c!=this;c=c.parentNode||this)if(1===c.nodeType&&(!0!==c.disabled||"click"!==e.type)){for(n=[],o=0;o<s;o++)void 0===n[a=(i=t[o]).selector+" "]&&(n[a]=i.needsContext?d(a,this).index(c)>-1:d.find(a,this,null,[c]).length),n[a]&&n.push(i);n.length&&r.push({elem:c,handlers:n})}return s<t.length&&r.push({elem:this,handlers:t.slice(s)}),r},fix:function(e){if(e[d.expando])return e;var t,o,a,i=e.type,r=e,s=this.fixHooks[i];for(s||(this.fixHooks[i]=s=he.test(i)?this.mouseHooks:de.test(i)?this.keyHooks:{}),a=s.props?this.props.concat(s.props):this.props,e=new d.Event(r),t=a.length;t--;)e[o=a[t]]=r[o];return e.target||(e.target=r.srcElement||n),3===e.target.nodeType&&(e.target=e.target.parentNode),e.metaKey=!!e.metaKey,s.filter?s.filter(e,r):e},props:"altKey bubbles cancelable ctrlKey currentTarget detail eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(e,t){return null==e.which&&(e.which=null!=t.charCode?t.charCode:t.keyCode),e}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(e,t){var o,a,i,r=t.button,s=t.fromElement;return null==e.pageX&&null!=t.clientX&&(i=(a=e.target.ownerDocument||n).documentElement,o=a.body,e.pageX=t.clientX+(i&&i.scrollLeft||o&&o.scrollLeft||0)-(i&&i.clientLeft||o&&o.clientLeft||0),e.pageY=t.clientY+(i&&i.scrollTop||o&&o.scrollTop||0)-(i&&i.clientTop||o&&o.clientTop||0)),!e.relatedTarget&&s&&(e.relatedTarget=s===e.target?t.toElement:s),e.which||void 0===r||(e.which=1&r?1:2&r?3:4&r?2:0),e}},special:{load:{noBubble:!0},focus:{trigger:function(){if(this!==ve()&&this.focus)try{return this.focus(),!1}catch(e){}},delegateType:"focusin"},blur:{trigger:function(){if(this===ve()&&this.blur)return this.blur(),!1},delegateType:"focusout"},click:{trigger:function(){if(d.nodeName(this,"input")&&"checkbox"===this.type&&this.click)return this.click(),!1},_default:function(e){return d.nodeName(e.target,"a")}},beforeunload:{postDispatch:function(e){void 0!==e.result&&e.originalEvent&&(e.originalEvent.returnValue=e.result)}}},simulate:function(e,t,o){var n=d.extend(new d.Event,o,{type:e,isSimulated:!0});d.event.trigger(n,null,t),n.isDefaultPrevented()&&o.preventDefault()}},d.removeEvent=n.removeEventListener?function(e,t,o){e.removeEventListener&&e.removeEventListener(t,o)}:function(e,t,o){var n="on"+t;e.detachEvent&&(void 0===e[n]&&(e[n]=null),e.detachEvent(n,o))},d.Event=function(e,t){if(!(this instanceof d.Event))return new d.Event(e,t);e&&e.type?(this.originalEvent=e,this.type=e.type,this.isDefaultPrevented=e.defaultPrevented||void 0===e.defaultPrevented&&!1===e.returnValue?fe:be):this.type=e,t&&d.extend(this,t),this.timeStamp=e&&e.timeStamp||d.now(),this[d.expando]=!0},d.Event.prototype={constructor:d.Event,isDefaultPrevented:be,isPropagationStopped:be,isImmediatePropagationStopped:be,preventDefault:function(){var e=this.originalEvent;this.isDefaultPrevented=fe,e&&(e.preventDefault?e.preventDefault():e.returnValue=!1)},stopPropagation:function(){var e=this.originalEvent;this.isPropagationStopped=fe,e&&!this.isSimulated&&(e.stopPropagation&&e.stopPropagation(),e.cancelBubble=!0)},stopImmediatePropagation:function(){var e=this.originalEvent;this.isImmediatePropagationStopped=fe,e&&e.stopImmediatePropagation&&e.stopImmediatePropagation(),this.stopPropagation()}},d.each({mouseenter:"mouseover",mouseleave:"mouseout",pointerenter:"pointerover",pointerleave:"pointerout"},(function(e,t){d.event.special[e]={delegateType:t,bindType:t,handle:function(e){var o,n=this,a=e.relatedTarget,i=e.handleObj;return a&&(a===n||d.contains(n,a))||(e.type=i.origType,o=i.handler.apply(this,arguments),e.type=t),o}}})),u.submit||(d.event.special.submit={setup:function(){if(d.nodeName(this,"form"))return!1;d.event.add(this,"click._submit keypress._submit",(function(e){var t=e.target,o=d.nodeName(t,"input")||d.nodeName(t,"button")?d.prop(t,"form"):void 0;o&&!d._data(o,"submit")&&(d.event.add(o,"submit._submit",(function(e){e._submitBubble=!0})),d._data(o,"submit",!0))}))},postDispatch:function(e){e._submitBubble&&(delete e._submitBubble,this.parentNode&&!e.isTrigger&&d.event.simulate("submit",this.parentNode,e))},teardown:function(){if(d.nodeName(this,"form"))return!1;d.event.remove(this,"._submit")}}),u.change||(d.event.special.change={setup:function(){if(ue.test(this.nodeName))return"checkbox"!==this.type&&"radio"!==this.type||(d.event.add(this,"propertychange._change",(function(e){"checked"===e.originalEvent.propertyName&&(this._justChanged=!0)})),d.event.add(this,"click._change",(function(e){this._justChanged&&!e.isTrigger&&(this._justChanged=!1),d.event.simulate("change",this,e)}))),!1;d.event.add(this,"beforeactivate._change",(function(e){var t=e.target;ue.test(t.nodeName)&&!d._data(t,"change")&&(d.event.add(t,"change._change",(function(e){!this.parentNode||e.isSimulated||e.isTrigger||d.event.simulate("change",this.parentNode,e)})),d._data(t,"change",!0))}))},handle:function(e){var t=e.target;if(this!==t||e.isSimulated||e.isTrigger||"radio"!==t.type&&"checkbox"!==t.type)return e.handleObj.handler.apply(this,arguments)},teardown:function(){return d.event.remove(this,"._change"),!ue.test(this.nodeName)}}),u.focusin||d.each({focus:"focusin",blur:"focusout"},(function(e,t){var o=function(e){d.event.simulate(t,e.target,d.event.fix(e))};d.event.special[t]={setup:function(){var n=this.ownerDocument||this,a=d._data(n,t);a||n.addEventListener(e,o,!0),d._data(n,t,(a||0)+1)},teardown:function(){var n=this.ownerDocument||this,a=d._data(n,t)-1;a?d._data(n,t,a):(n.removeEventListener(e,o,!0),d._removeData(n,t))}}})),d.fn.extend({on:function(e,t,o,n){return we(this,e,t,o,n)},one:function(e,t,o,n){return we(this,e,t,o,n,1)},off:function(e,t,o){var n,a;if(e&&e.preventDefault&&e.handleObj)return n=e.handleObj,d(e.delegateTarget).off(n.namespace?n.origType+"."+n.namespace:n.origType,n.selector,n.handler),this;if("object"==typeof e){for(a in e)this.off(a,t,e[a]);return this}return!1!==t&&"function"!=typeof t||(o=t,t=void 0),!1===o&&(o=be),this.each((function(){d.event.remove(this,e,o,t)}))},trigger:function(e,t){return this.each((function(){d.event.trigger(e,t,this)}))},triggerHandler:function(e,t){var o=this[0];if(o)return d.event.trigger(e,t,o,!0)}});var ye=/ jQuery\d+="(?:null|\d+)"/g,ke=new RegExp("<(?:"+oe+")[\\s/>]","i"),Ce=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:-]+)[^>]*)\/>/gi,Ae=/<script|<style|<link/i,xe=/checked\s*(?:[^=]|=\s*.checked.)/i,Me=/^true\/(.*)/,_e=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g,De=ne(n).appendChild(n.createElement("div"));function Ee(e,t){return d.nodeName(e,"table")&&d.nodeName(11!==t.nodeType?t:t.firstChild,"tr")?e.getElementsByTagName("tbody")[0]||e.appendChild(e.ownerDocument.createElement("tbody")):e}function Te(e){return e.type=(null!==d.find.attr(e,"type"))+"/"+e.type,e}function qe(e){var t=Me.exec(e.type);return t?e.type=t[1]:e.removeAttribute("type"),e}function Se(e,t){if(1===t.nodeType&&d.hasData(e)){var o,n,a,i=d._data(e),r=d._data(t,i),s=i.events;if(s)for(o in delete r.handle,r.events={},s)for(n=0,a=s[o].length;n<a;n++)d.event.add(t,o,s[o][n]);r.data&&(r.data=d.extend({},r.data))}}function ze(e,t){var o,n,a;if(1===t.nodeType){if(o=t.nodeName.toLowerCase(),!u.noCloneEvent&&t[d.expando]){for(n in(a=d._data(t)).events)d.removeEvent(t,n,a.handle);t.removeAttribute(d.expando)}"script"===o&&t.text!==e.text?(Te(t).text=e.text,qe(t)):"object"===o?(t.parentNode&&(t.outerHTML=e.outerHTML),u.html5Clone&&e.innerHTML&&!d.trim(t.innerHTML)&&(t.innerHTML=e.innerHTML)):"input"===o&&Z.test(e.type)?(t.defaultChecked=t.checked=e.checked,t.value!==e.value&&(t.value=e.value)):"option"===o?t.defaultSelected=t.selected=e.defaultSelected:"input"!==o&&"textarea"!==o||(t.defaultValue=e.defaultValue)}}function Ve(e,t,o,n){t=i.apply([],t);var a,r,s,c,m,l,h=0,p=e.length,g=p-1,f=t[0],b=d.isFunction(f);if(b||p>1&&"string"==typeof f&&!u.checkClone&&xe.test(f))return e.each((function(a){var i=e.eq(a);b&&(t[0]=f.call(this,a,i.html())),Ve(i,t,o,n)}));if(p&&(a=(l=le(t,e[0].ownerDocument,!1,e,n)).firstChild,1===l.childNodes.length&&(l=a),a||n)){for(s=(c=d.map(ie(l,"script"),Te)).length;h<p;h++)r=l,h!==g&&(r=d.clone(r,!0,!0),s&&d.merge(c,ie(r,"script"))),o.call(e[h],r,h);if(s)for(m=c[c.length-1].ownerDocument,d.map(c,qe),h=0;h<s;h++)r=c[h],ee.test(r.type||"")&&!d._data(r,"globalEval")&&d.contains(m,r)&&(r.src?d._evalUrl&&d._evalUrl(r.src):d.globalEval((r.text||r.textContent||r.innerHTML||"").replace(_e,"")));l=a=null}return e}function Be(e,t,o){for(var n,a=t?d.filter(t,e):e,i=0;null!=(n=a[i]);i++)o||1!==n.nodeType||d.cleanData(ie(n)),n.parentNode&&(o&&d.contains(n.ownerDocument,n)&&re(ie(n,"script")),n.parentNode.removeChild(n));return e}d.extend({htmlPrefilter:function(e){return e.replace(Ce,"<$1></$2>")},clone:function(e,t,o){var n,a,i,r,s,c=d.contains(e.ownerDocument,e);if(u.html5Clone||d.isXMLDoc(e)||!ke.test("<"+e.nodeName+">")?i=e.cloneNode(!0):(De.innerHTML=e.outerHTML,De.removeChild(i=De.firstChild)),!(u.noCloneEvent&&u.noCloneChecked||1!==e.nodeType&&11!==e.nodeType||d.isXMLDoc(e)))for(n=ie(i),s=ie(e),r=0;null!=(a=s[r]);++r)n[r]&&ze(a,n[r]);if(t)if(o)for(s=s||ie(e),n=n||ie(i),r=0;null!=(a=s[r]);r++)Se(a,n[r]);else Se(e,i);return(n=ie(i,"script")).length>0&&re(n,!c&&ie(e,"script")),n=s=a=null,i},cleanData:function(e,t){for(var n,a,i,r,s=0,c=d.expando,m=d.cache,l=u.attributes,h=d.event.special;null!=(n=e[s]);s++)if((t||G(n))&&(r=(i=n[c])&&m[i])){if(r.events)for(a in r.events)h[a]?d.event.remove(n,a):d.removeEvent(n,a,r.handle);m[i]&&(delete m[i],l||void 0===n.removeAttribute?n[c]=void 0:n.removeAttribute(c),o.push(i))}}}),d.fn.extend({domManip:Ve,detach:function(e){return Be(this,e,!0)},remove:function(e){return Be(this,e)},text:function(e){return Y(this,(function(e){return void 0===e?d.text(this):this.empty().append((this[0]&&this[0].ownerDocument||n).createTextNode(e))}),null,e,arguments.length)},append:function(){return Ve(this,arguments,(function(e){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||Ee(this,e).appendChild(e)}))},prepend:function(){return Ve(this,arguments,(function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=Ee(this,e);t.insertBefore(e,t.firstChild)}}))},before:function(){return Ve(this,arguments,(function(e){this.parentNode&&this.parentNode.insertBefore(e,this)}))},after:function(){return Ve(this,arguments,(function(e){this.parentNode&&this.parentNode.insertBefore(e,this.nextSibling)}))},empty:function(){for(var e,t=0;null!=(e=this[t]);t++){for(1===e.nodeType&&d.cleanData(ie(e,!1));e.firstChild;)e.removeChild(e.firstChild);e.options&&d.nodeName(e,"select")&&(e.options.length=0)}return this},clone:function(e,t){return e=null!=e&&e,t=null==t?e:t,this.map((function(){return d.clone(this,e,t)}))},html:function(e){return Y(this,(function(e){var t=this[0]||{},o=0,n=this.length;if(void 0===e)return 1===t.nodeType?t.innerHTML.replace(ye,""):void 0;if("string"==typeof e&&!Ae.test(e)&&(u.htmlSerialize||!ke.test(e))&&(u.leadingWhitespace||!te.test(e))&&!ae[(X.exec(e)||["",""])[1].toLowerCase()]){e=d.htmlPrefilter(e);try{for(;o<n;o++)1===(t=this[o]||{}).nodeType&&(d.cleanData(ie(t,!1)),t.innerHTML=e);t=0}catch(e){}}t&&this.empty().append(e)}),null,e,arguments.length)},replaceWith:function(){var e=[];return Ve(this,arguments,(function(t){var o=this.parentNode;d.inArray(this,e)<0&&(d.cleanData(ie(this)),o&&o.replaceChild(t,this))}),e)}}),d.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},(function(e,t){d.fn[e]=function(e){for(var o,n=0,a=[],i=d(e),s=i.length-1;n<=s;n++)o=n===s?this:this.clone(!0),d(i[n])[t](o),r.apply(a,o.get());return this.pushStack(a)}}));var Re,Ge={HTML:"block",BODY:"block"};function je(e,t){var o=d(t.createElement(e)).appendTo(t.body),n=d.css(o[0],"display");return o.detach(),n}function Fe(e){var t=n,o=Ge[e];return o||("none"!==(o=je(e,t))&&o||((t=((Re=(Re||d("<iframe frameborder='0' width='0' height='0'/>")).appendTo(t.documentElement))[0].contentWindow||Re[0].contentDocument).document).write(),t.close(),o=je(e,t),Re.detach()),Ge[e]=o),o}var He=/^margin/,Ne=new RegExp("^("+O+")(?!px)[a-z%]+$","i"),Ie=function(e,t,o,n){var a,i,r={};for(i in t)r[i]=e.style[i],e.style[i]=t[i];for(i in a=o.apply(e,n||[]),t)e.style[i]=r[i];return a},Pe=n.documentElement;!function(){var t,o,a,i,r,s,c=n.createElement("div"),m=n.createElement("div");function l(){var l,u,d=n.documentElement;d.appendChild(c),m.style.cssText="-webkit-box-sizing:border-box;box-sizing:border-box;position:relative;display:block;margin:auto;border:1px;padding:1px;top:1%;width:50%",t=a=s=!1,o=r=!0,e.getComputedStyle&&(u=e.getComputedStyle(m),t="1%"!==(u||{}).top,s="2px"===(u||{}).marginLeft,a="4px"===(u||{width:"4px"}).width,m.style.marginRight="50%",o="4px"===(u||{marginRight:"4px"}).marginRight,(l=m.appendChild(n.createElement("div"))).style.cssText=m.style.cssText="-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;display:block;margin:0;border:0;padding:0",l.style.marginRight=l.style.width="0",m.style.width="1px",r=!parseFloat((e.getComputedStyle(l)||{}).marginRight),m.removeChild(l)),m.style.display="none",(i=0===m.getClientRects().length)&&(m.style.display="",m.innerHTML="<table><tr><td></td><td>t</td></tr></table>",m.childNodes[0].style.borderCollapse="separate",(l=m.getElementsByTagName("td"))[0].style.cssText="margin:0;border:0;padding:0;display:none",(i=0===l[0].offsetHeight)&&(l[0].style.display="",l[1].style.display="none",i=0===l[0].offsetHeight)),d.removeChild(c)}m.style&&(m.style.cssText="float:left;opacity:.5",u.opacity="0.5"===m.style.opacity,u.cssFloat=!!m.style.cssFloat,m.style.backgroundClip="content-box",m.cloneNode(!0).style.backgroundClip="",u.clearCloneStyle="content-box"===m.style.backgroundClip,(c=n.createElement("div")).style.cssText="border:0;width:8px;height:0;top:0;left:-9999px;padding:0;margin-top:1px;position:absolute",m.innerHTML="",c.appendChild(m),u.boxSizing=""===m.style.boxSizing||""===m.style.MozBoxSizing||""===m.style.WebkitBoxSizing,d.extend(u,{reliableHiddenOffsets:function(){return null==t&&l(),i},boxSizingReliable:function(){return null==t&&l(),a},pixelMarginRight:function(){return null==t&&l(),o},pixelPosition:function(){return null==t&&l(),t},reliableMarginRight:function(){return null==t&&l(),r},reliableMarginLeft:function(){return null==t&&l(),s}}))}();var Oe,Le,Ue=/^(top|right|bottom|left)$/;function We(e,t){return{get:function(){if(!e())return(this.get=t).apply(this,arguments);delete this.get}}}e.getComputedStyle?(Oe=function(t){var o=t.ownerDocument.defaultView;return o&&o.opener||(o=e),o.getComputedStyle(t)},Le=function(e,t,o){var n,a,i,r,s=e.style;return""!==(r=(o=o||Oe(e))?o.getPropertyValue(t)||o[t]:void 0)&&void 0!==r||d.contains(e.ownerDocument,e)||(r=d.style(e,t)),o&&!u.pixelMarginRight()&&Ne.test(r)&&He.test(t)&&(n=s.width,a=s.minWidth,i=s.maxWidth,s.minWidth=s.maxWidth=s.width=r,r=o.width,s.width=n,s.minWidth=a,s.maxWidth=i),void 0===r?r:r+""}):Pe.currentStyle&&(Oe=function(e){return e.currentStyle},Le=function(e,t,o){var n,a,i,r,s=e.style;return null==(r=(o=o||Oe(e))?o[t]:void 0)&&s&&s[t]&&(r=s[t]),Ne.test(r)&&!Ue.test(t)&&(n=s.left,(i=(a=e.runtimeStyle)&&a.left)&&(a.left=e.currentStyle.left),s.left="fontSize"===t?"1em":r,r=s.pixelLeft+"px",s.left=n,i&&(a.left=i)),void 0===r?r:r+""||"auto"});var $e=/alpha\([^)]*\)/i,Qe=/opacity\s*=\s*([^)]*)/i,Ke=/^(none|table(?!-c[ea]).+)/,Je=new RegExp("^("+O+")(.*)$","i"),Ye={position:"absolute",visibility:"hidden",display:"block"},Ze={letterSpacing:"0",fontWeight:"400"},Xe=["Webkit","O","Moz","ms"],et=n.createElement("div").style;function tt(e){if(e in et)return e;for(var t=e.charAt(0).toUpperCase()+e.slice(1),o=Xe.length;o--;)if((e=Xe[o]+t)in et)return e}function ot(e,t){for(var o,n,a,i=[],r=0,s=e.length;r<s;r++)(n=e[r]).style&&(i[r]=d._data(n,"olddisplay"),o=n.style.display,t?(i[r]||"none"!==o||(n.style.display=""),""===n.style.display&&W(n)&&(i[r]=d._data(n,"olddisplay",Fe(n.nodeName)))):(a=W(n),(o&&"none"!==o||!a)&&d._data(n,"olddisplay",a?o:d.css(n,"display"))));for(r=0;r<s;r++)(n=e[r]).style&&(t&&"none"!==n.style.display&&""!==n.style.display||(n.style.display=t?i[r]||"":"none"));return e}function nt(e,t,o){var n=Je.exec(t);return n?Math.max(0,n[1]-(o||0))+(n[2]||"px"):t}function at(e,t,o,n,a){for(var i=o===(n?"border":"content")?4:"width"===t?1:0,r=0;i<4;i+=2)"margin"===o&&(r+=d.css(e,o+U[i],!0,a)),n?("content"===o&&(r-=d.css(e,"padding"+U[i],!0,a)),"margin"!==o&&(r-=d.css(e,"border"+U[i]+"Width",!0,a))):(r+=d.css(e,"padding"+U[i],!0,a),"padding"!==o&&(r+=d.css(e,"border"+U[i]+"Width",!0,a)));return r}function it(e,t,o){var n=!0,a="width"===t?e.offsetWidth:e.offsetHeight,i=Oe(e),r=u.boxSizing&&"border-box"===d.css(e,"boxSizing",!1,i);if(a<=0||null==a){if(((a=Le(e,t,i))<0||null==a)&&(a=e.style[t]),Ne.test(a))return a;n=r&&(u.boxSizingReliable()||a===e.style[t]),a=parseFloat(a)||0}return a+at(e,t,o||(r?"border":"content"),n,i)+"px"}function rt(e,t,o,n,a){return new rt.prototype.init(e,t,o,n,a)}d.extend({cssHooks:{opacity:{get:function(e,t){if(t){var o=Le(e,"opacity");return""===o?"1":o}}}},cssNumber:{animationIterationCount:!0,columnCount:!0,fillOpacity:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{float:u.cssFloat?"cssFloat":"styleFloat"},style:function(e,t,o,n){if(e&&3!==e.nodeType&&8!==e.nodeType&&e.style){var a,i,r,s=d.camelCase(t),c=e.style;if(t=d.cssProps[s]||(d.cssProps[s]=tt(s)||s),r=d.cssHooks[t]||d.cssHooks[s],void 0===o)return r&&"get"in r&&void 0!==(a=r.get(e,!1,n))?a:c[t];if("string"===(i=typeof o)&&(a=L.exec(o))&&a[1]&&(o=$(e,t,a),i="number"),null!=o&&o==o&&("number"===i&&(o+=a&&a[3]||(d.cssNumber[s]?"":"px")),u.clearCloneStyle||""!==o||0!==t.indexOf("background")||(c[t]="inherit"),!(r&&"set"in r&&void 0===(o=r.set(e,o,n)))))try{c[t]=o}catch(e){}}},css:function(e,t,o,n){var a,i,r,s=d.camelCase(t);return t=d.cssProps[s]||(d.cssProps[s]=tt(s)||s),(r=d.cssHooks[t]||d.cssHooks[s])&&"get"in r&&(i=r.get(e,!0,o)),void 0===i&&(i=Le(e,t,n)),"normal"===i&&t in Ze&&(i=Ze[t]),""===o||o?(a=parseFloat(i),!0===o||isFinite(a)?a||0:i):i}}),d.each(["height","width"],(function(e,t){d.cssHooks[t]={get:function(e,o,n){if(o)return Ke.test(d.css(e,"display"))&&0===e.offsetWidth?Ie(e,Ye,(function(){return it(e,t,n)})):it(e,t,n)},set:function(e,o,n){var a=n&&Oe(e);return nt(0,o,n?at(e,t,n,u.boxSizing&&"border-box"===d.css(e,"boxSizing",!1,a),a):0)}}})),u.opacity||(d.cssHooks.opacity={get:function(e,t){return Qe.test((t&&e.currentStyle?e.currentStyle.filter:e.style.filter)||"")?.01*parseFloat(RegExp.$1)+"":t?"1":""},set:function(e,t){var o=e.style,n=e.currentStyle,a=d.isNumeric(t)?"alpha(opacity="+100*t+")":"",i=n&&n.filter||o.filter||"";o.zoom=1,(t>=1||""===t)&&""===d.trim(i.replace($e,""))&&o.removeAttribute&&(o.removeAttribute("filter"),""===t||n&&!n.filter)||(o.filter=$e.test(i)?i.replace($e,a):i+" "+a)}}),d.cssHooks.marginRight=We(u.reliableMarginRight,(function(e,t){if(t)return Ie(e,{display:"inline-block"},Le,[e,"marginRight"])})),d.cssHooks.marginLeft=We(u.reliableMarginLeft,(function(e,t){if(t)return(parseFloat(Le(e,"marginLeft"))||(d.contains(e.ownerDocument,e)?e.getBoundingClientRect().left-Ie(e,{marginLeft:0},(function(){return e.getBoundingClientRect().left})):0))+"px"})),d.each({margin:"",padding:"",border:"Width"},(function(e,t){d.cssHooks[e+t]={expand:function(o){for(var n=0,a={},i="string"==typeof o?o.split(" "):[o];n<4;n++)a[e+U[n]+t]=i[n]||i[n-2]||i[0];return a}},He.test(e)||(d.cssHooks[e+t].set=nt)})),d.fn.extend({css:function(e,t){return Y(this,(function(e,t,o){var n,a,i={},r=0;if(d.isArray(t)){for(n=Oe(e),a=t.length;r<a;r++)i[t[r]]=d.css(e,t[r],!1,n);return i}return void 0!==o?d.style(e,t,o):d.css(e,t)}),e,t,arguments.length>1)},show:function(){return ot(this,!0)},hide:function(){return ot(this)},toggle:function(e){return"boolean"==typeof e?e?this.show():this.hide():this.each((function(){W(this)?d(this).show():d(this).hide()}))}}),d.Tween=rt,rt.prototype={constructor:rt,init:function(e,t,o,n,a,i){this.elem=e,this.prop=o,this.easing=a||d.easing._default,this.options=t,this.start=this.now=this.cur(),this.end=n,this.unit=i||(d.cssNumber[o]?"":"px")},cur:function(){var e=rt.propHooks[this.prop];return e&&e.get?e.get(this):rt.propHooks._default.get(this)},run:function(e){var t,o=rt.propHooks[this.prop];return this.options.duration?this.pos=t=d.easing[this.easing](e,this.options.duration*e,0,1,this.options.duration):this.pos=t=e,this.now=(this.end-this.start)*t+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),o&&o.set?o.set(this):rt.propHooks._default.set(this),this}},rt.prototype.init.prototype=rt.prototype,rt.propHooks={_default:{get:function(e){var t;return 1!==e.elem.nodeType||null!=e.elem[e.prop]&&null==e.elem.style[e.prop]?e.elem[e.prop]:(t=d.css(e.elem,e.prop,""))&&"auto"!==t?t:0},set:function(e){d.fx.step[e.prop]?d.fx.step[e.prop](e):1!==e.elem.nodeType||null==e.elem.style[d.cssProps[e.prop]]&&!d.cssHooks[e.prop]?e.elem[e.prop]=e.now:d.style(e.elem,e.prop,e.now+e.unit)}}},rt.propHooks.scrollTop=rt.propHooks.scrollLeft={set:function(e){e.elem.nodeType&&e.elem.parentNode&&(e.elem[e.prop]=e.now)}},d.easing={linear:function(e){return e},swing:function(e){return.5-Math.cos(e*Math.PI)/2},_default:"swing"},d.fx=rt.prototype.init,d.fx.step={};var st,ct,mt=/^(?:toggle|show|hide)$/,lt=/queueHooks$/;function ut(){return e.setTimeout((function(){st=void 0})),st=d.now()}function dt(e,t){var o,n={height:e},a=0;for(t=t?1:0;a<4;a+=2-t)n["margin"+(o=U[a])]=n["padding"+o]=e;return t&&(n.opacity=n.width=e),n}function ht(e,t,o){for(var n,a=(pt.tweeners[t]||[]).concat(pt.tweeners["*"]),i=0,r=a.length;i<r;i++)if(n=a[i].call(o,t,e))return n}function pt(e,t,o){var n,a,i=0,r=pt.prefilters.length,s=d.Deferred().always((function(){delete c.elem})),c=function(){if(a)return!1;for(var t=st||ut(),o=Math.max(0,m.startTime+m.duration-t),n=1-(o/m.duration||0),i=0,r=m.tweens.length;i<r;i++)m.tweens[i].run(n);return s.notifyWith(e,[m,n,o]),n<1&&r?o:(s.resolveWith(e,[m]),!1)},m=s.promise({elem:e,props:d.extend({},t),opts:d.extend(!0,{specialEasing:{},easing:d.easing._default},o),originalProperties:t,originalOptions:o,startTime:st||ut(),duration:o.duration,tweens:[],createTween:function(t,o){var n=d.Tween(e,m.opts,t,o,m.opts.specialEasing[t]||m.opts.easing);return m.tweens.push(n),n},stop:function(t){var o=0,n=t?m.tweens.length:0;if(a)return this;for(a=!0;o<n;o++)m.tweens[o].run(1);return t?(s.notifyWith(e,[m,1,0]),s.resolveWith(e,[m,t])):s.rejectWith(e,[m,t]),this}}),l=m.props;for(!function(e,t){var o,n,a,i,r;for(o in e)if(a=t[n=d.camelCase(o)],i=e[o],d.isArray(i)&&(a=i[1],i=e[o]=i[0]),o!==n&&(e[n]=i,delete e[o]),(r=d.cssHooks[n])&&"expand"in r)for(o in i=r.expand(i),delete e[n],i)o in e||(e[o]=i[o],t[o]=a);else t[n]=a}(l,m.opts.specialEasing);i<r;i++)if(n=pt.prefilters[i].call(m,e,l,m.opts))return d.isFunction(n.stop)&&(d._queueHooks(m.elem,m.opts.queue).stop=d.proxy(n.stop,n)),n;return d.map(l,ht,m),d.isFunction(m.opts.start)&&m.opts.start.call(e,m),d.fx.timer(d.extend(c,{elem:e,anim:m,queue:m.opts.queue})),m.progress(m.opts.progress).done(m.opts.done,m.opts.complete).fail(m.opts.fail).always(m.opts.always)}d.Animation=d.extend(pt,{tweeners:{"*":[function(e,t){var o=this.createTween(e,t);return $(o.elem,e,L.exec(t),o),o}]},tweener:function(e,t){d.isFunction(e)?(t=e,e=["*"]):e=e.match(z);for(var o,n=0,a=e.length;n<a;n++)o=e[n],pt.tweeners[o]=pt.tweeners[o]||[],pt.tweeners[o].unshift(t)},prefilters:[function(e,t,o){var n,a,i,r,s,c,m,l=this,h={},p=e.style,g=e.nodeType&&W(e),f=d._data(e,"fxshow");for(n in o.queue||(null==(s=d._queueHooks(e,"fx")).unqueued&&(s.unqueued=0,c=s.empty.fire,s.empty.fire=function(){s.unqueued||c()}),s.unqueued++,l.always((function(){l.always((function(){s.unqueued--,d.queue(e,"fx").length||s.empty.fire()}))}))),1===e.nodeType&&("height"in t||"width"in t)&&(o.overflow=[p.overflow,p.overflowX,p.overflowY],"inline"===("none"===(m=d.css(e,"display"))?d._data(e,"olddisplay")||Fe(e.nodeName):m)&&"none"===d.css(e,"float")&&(u.inlineBlockNeedsLayout&&"inline"!==Fe(e.nodeName)?p.zoom=1:p.display="inline-block")),o.overflow&&(p.overflow="hidden",u.shrinkWrapBlocks()||l.always((function(){p.overflow=o.overflow[0],p.overflowX=o.overflow[1],p.overflowY=o.overflow[2]}))),t)if(a=t[n],mt.exec(a)){if(delete t[n],i=i||"toggle"===a,a===(g?"hide":"show")){if("show"!==a||!f||void 0===f[n])continue;g=!0}h[n]=f&&f[n]||d.style(e,n)}else m=void 0;if(d.isEmptyObject(h))"inline"===("none"===m?Fe(e.nodeName):m)&&(p.display=m);else for(n in f?"hidden"in f&&(g=f.hidden):f=d._data(e,"fxshow",{}),i&&(f.hidden=!g),g?d(e).show():l.done((function(){d(e).hide()})),l.done((function(){var t;for(t in d._removeData(e,"fxshow"),h)d.style(e,t,h[t])})),h)r=ht(g?f[n]:0,n,l),n in f||(f[n]=r.start,g&&(r.end=r.start,r.start="width"===n||"height"===n?1:0))}],prefilter:function(e,t){t?pt.prefilters.unshift(e):pt.prefilters.push(e)}}),d.speed=function(e,t,o){var n=e&&"object"==typeof e?d.extend({},e):{complete:o||!o&&t||d.isFunction(e)&&e,duration:e,easing:o&&t||t&&!d.isFunction(t)&&t};return n.duration=d.fx.off?0:"number"==typeof n.duration?n.duration:n.duration in d.fx.speeds?d.fx.speeds[n.duration]:d.fx.speeds._default,null!=n.queue&&!0!==n.queue||(n.queue="fx"),n.old=n.complete,n.complete=function(){d.isFunction(n.old)&&n.old.call(this),n.queue&&d.dequeue(this,n.queue)},n},d.fn.extend({fadeTo:function(e,t,o,n){return this.filter(W).css("opacity",0).show().end().animate({opacity:t},e,o,n)},animate:function(e,t,o,n){var a=d.isEmptyObject(e),i=d.speed(t,o,n),r=function(){var t=pt(this,d.extend({},e),i);(a||d._data(this,"finish"))&&t.stop(!0)};return r.finish=r,a||!1===i.queue?this.each(r):this.queue(i.queue,r)},stop:function(e,t,o){var n=function(e){var t=e.stop;delete e.stop,t(o)};return"string"!=typeof e&&(o=t,t=e,e=void 0),t&&!1!==e&&this.queue(e||"fx",[]),this.each((function(){var t=!0,a=null!=e&&e+"queueHooks",i=d.timers,r=d._data(this);if(a)r[a]&&r[a].stop&&n(r[a]);else for(a in r)r[a]&&r[a].stop&&lt.test(a)&&n(r[a]);for(a=i.length;a--;)i[a].elem!==this||null!=e&&i[a].queue!==e||(i[a].anim.stop(o),t=!1,i.splice(a,1));!t&&o||d.dequeue(this,e)}))},finish:function(e){return!1!==e&&(e=e||"fx"),this.each((function(){var t,o=d._data(this),n=o[e+"queue"],a=o[e+"queueHooks"],i=d.timers,r=n?n.length:0;for(o.finish=!0,d.queue(this,e,[]),a&&a.stop&&a.stop.call(this,!0),t=i.length;t--;)i[t].elem===this&&i[t].queue===e&&(i[t].anim.stop(!0),i.splice(t,1));for(t=0;t<r;t++)n[t]&&n[t].finish&&n[t].finish.call(this);delete o.finish}))}}),d.each(["toggle","show","hide"],(function(e,t){var o=d.fn[t];d.fn[t]=function(e,n,a){return null==e||"boolean"==typeof e?o.apply(this,arguments):this.animate(dt(t,!0),e,n,a)}})),d.each({slideDown:dt("show"),slideUp:dt("hide"),slideToggle:dt("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},(function(e,t){d.fn[e]=function(e,o,n){return this.animate(t,e,o,n)}})),d.timers=[],d.fx.tick=function(){var e,t=d.timers,o=0;for(st=d.now();o<t.length;o++)(e=t[o])()||t[o]!==e||t.splice(o--,1);t.length||d.fx.stop(),st=void 0},d.fx.timer=function(e){d.timers.push(e),e()?d.fx.start():d.timers.pop()},d.fx.interval=13,d.fx.start=function(){ct||(ct=e.setInterval(d.fx.tick,d.fx.interval))},d.fx.stop=function(){e.clearInterval(ct),ct=null},d.fx.speeds={slow:600,fast:200,_default:400},d.fn.delay=function(t,o){return t=d.fx&&d.fx.speeds[t]||t,o=o||"fx",this.queue(o,(function(o,n){var a=e.setTimeout(o,t);n.stop=function(){e.clearTimeout(a)}}))},function(){var e,t=n.createElement("input"),o=n.createElement("div"),a=n.createElement("select"),i=a.appendChild(n.createElement("option"));(o=n.createElement("div")).setAttribute("className","t"),o.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",e=o.getElementsByTagName("a")[0],t.setAttribute("type","checkbox"),o.appendChild(t),(e=o.getElementsByTagName("a")[0]).style.cssText="top:1px",u.getSetAttribute="t"!==o.className,u.style=/top/.test(e.getAttribute("style")),u.hrefNormalized="/a"===e.getAttribute("href"),u.checkOn=!!t.value,u.optSelected=i.selected,u.enctype=!!n.createElement("form").enctype,a.disabled=!0,u.optDisabled=!i.disabled,(t=n.createElement("input")).setAttribute("value",""),u.input=""===t.getAttribute("value"),t.value="t",t.setAttribute("type","radio"),u.radioValue="t"===t.value}();var gt=/\r/g,ft=/[\x20\t\r\n\f]+/g;d.fn.extend({val:function(e){var t,o,n,a=this[0];return arguments.length?(n=d.isFunction(e),this.each((function(o){var a;1===this.nodeType&&(null==(a=n?e.call(this,o,d(this).val()):e)?a="":"number"==typeof a?a+="":d.isArray(a)&&(a=d.map(a,(function(e){return null==e?"":e+""}))),(t=d.valHooks[this.type]||d.valHooks[this.nodeName.toLowerCase()])&&"set"in t&&void 0!==t.set(this,a,"value")||(this.value=a))}))):a?(t=d.valHooks[a.type]||d.valHooks[a.nodeName.toLowerCase()])&&"get"in t&&void 0!==(o=t.get(a,"value"))?o:"string"==typeof(o=a.value)?o.replace(gt,""):null==o?"":o:void 0}}),d.extend({valHooks:{option:{get:function(e){var t=d.find.attr(e,"value");return null!=t?t:d.trim(d.text(e)).replace(ft," ")}},select:{get:function(e){for(var t,o,n=e.options,a=e.selectedIndex,i="select-one"===e.type||a<0,r=i?null:[],s=i?a+1:n.length,c=a<0?s:i?a:0;c<s;c++)if(((o=n[c]).selected||c===a)&&(u.optDisabled?!o.disabled:null===o.getAttribute("disabled"))&&(!o.parentNode.disabled||!d.nodeName(o.parentNode,"optgroup"))){if(t=d(o).val(),i)return t;r.push(t)}return r},set:function(e,t){for(var o,n,a=e.options,i=d.makeArray(t),r=a.length;r--;)if(n=a[r],d.inArray(d.valHooks.option.get(n),i)>-1)try{n.selected=o=!0}catch(e){n.scrollHeight}else n.selected=!1;return o||(e.selectedIndex=-1),a}}}}),d.each(["radio","checkbox"],(function(){d.valHooks[this]={set:function(e,t){if(d.isArray(t))return e.checked=d.inArray(d(e).val(),t)>-1}},u.checkOn||(d.valHooks[this].get=function(e){return null===e.getAttribute("value")?"on":e.value})}));var bt,vt,wt=d.expr.attrHandle,yt=/^(?:checked|selected)$/i,kt=u.getSetAttribute,Ct=u.input;d.fn.extend({attr:function(e,t){return Y(this,d.attr,e,t,arguments.length>1)},removeAttr:function(e){return this.each((function(){d.removeAttr(this,e)}))}}),d.extend({attr:function(e,t,o){var n,a,i=e.nodeType;if(3!==i&&8!==i&&2!==i)return void 0===e.getAttribute?d.prop(e,t,o):(1===i&&d.isXMLDoc(e)||(t=t.toLowerCase(),a=d.attrHooks[t]||(d.expr.match.bool.test(t)?vt:bt)),void 0!==o?null===o?void d.removeAttr(e,t):a&&"set"in a&&void 0!==(n=a.set(e,o,t))?n:(e.setAttribute(t,o+""),o):a&&"get"in a&&null!==(n=a.get(e,t))?n:null==(n=d.find.attr(e,t))?void 0:n)},attrHooks:{type:{set:function(e,t){if(!u.radioValue&&"radio"===t&&d.nodeName(e,"input")){var o=e.value;return e.setAttribute("type",t),o&&(e.value=o),t}}}},removeAttr:function(e,t){var o,n,a=0,i=t&&t.match(z);if(i&&1===e.nodeType)for(;o=i[a++];)n=d.propFix[o]||o,d.expr.match.bool.test(o)?Ct&&kt||!yt.test(o)?e[n]=!1:e[d.camelCase("default-"+o)]=e[n]=!1:d.attr(e,o,""),e.removeAttribute(kt?o:n)}}),vt={set:function(e,t,o){return!1===t?d.removeAttr(e,o):Ct&&kt||!yt.test(o)?e.setAttribute(!kt&&d.propFix[o]||o,o):e[d.camelCase("default-"+o)]=e[o]=!0,o}},d.each(d.expr.match.bool.source.match(/\w+/g),(function(e,t){var o=wt[t]||d.find.attr;Ct&&kt||!yt.test(t)?wt[t]=function(e,t,n){var a,i;return n||(i=wt[t],wt[t]=a,a=null!=o(e,t,n)?t.toLowerCase():null,wt[t]=i),a}:wt[t]=function(e,t,o){if(!o)return e[d.camelCase("default-"+t)]?t.toLowerCase():null}})),Ct&&kt||(d.attrHooks.value={set:function(e,t,o){if(!d.nodeName(e,"input"))return bt&&bt.set(e,t,o);e.defaultValue=t}}),kt||(bt={set:function(e,t,o){var n=e.getAttributeNode(o);if(n||e.setAttributeNode(n=e.ownerDocument.createAttribute(o)),n.value=t+="","value"===o||t===e.getAttribute(o))return t}},wt.id=wt.name=wt.coords=function(e,t,o){var n;if(!o)return(n=e.getAttributeNode(t))&&""!==n.value?n.value:null},d.valHooks.button={get:function(e,t){var o=e.getAttributeNode(t);if(o&&o.specified)return o.value},set:bt.set},d.attrHooks.contenteditable={set:function(e,t,o){bt.set(e,""!==t&&t,o)}},d.each(["width","height"],(function(e,t){d.attrHooks[t]={set:function(e,o){if(""===o)return e.setAttribute(t,"auto"),o}}}))),u.style||(d.attrHooks.style={get:function(e){return e.style.cssText||void 0},set:function(e,t){return e.style.cssText=t+""}});var At=/^(?:input|select|textarea|button|object)$/i,xt=/^(?:a|area)$/i;d.fn.extend({prop:function(e,t){return Y(this,d.prop,e,t,arguments.length>1)},removeProp:function(e){return e=d.propFix[e]||e,this.each((function(){try{this[e]=void 0,delete this[e]}catch(e){}}))}}),d.extend({prop:function(e,t,o){var n,a,i=e.nodeType;if(3!==i&&8!==i&&2!==i)return 1===i&&d.isXMLDoc(e)||(t=d.propFix[t]||t,a=d.propHooks[t]),void 0!==o?a&&"set"in a&&void 0!==(n=a.set(e,o,t))?n:e[t]=o:a&&"get"in a&&null!==(n=a.get(e,t))?n:e[t]},propHooks:{tabIndex:{get:function(e){var t=d.find.attr(e,"tabindex");return t?parseInt(t,10):At.test(e.nodeName)||xt.test(e.nodeName)&&e.href?0:-1}}},propFix:{for:"htmlFor",class:"className"}}),u.hrefNormalized||d.each(["href","src"],(function(e,t){d.propHooks[t]={get:function(e){return e.getAttribute(t,4)}}})),u.optSelected||(d.propHooks.selected={get:function(e){var t=e.parentNode;return t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex),null},set:function(e){var t=e.parentNode;t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex)}}),d.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],(function(){d.propFix[this.toLowerCase()]=this})),u.enctype||(d.propFix.enctype="encoding");var Mt=/[\t\r\n\f]/g;function _t(e){return d.attr(e,"class")||""}d.fn.extend({addClass:function(e){var t,o,n,a,i,r,s,c=0;if(d.isFunction(e))return this.each((function(t){d(this).addClass(e.call(this,t,_t(this)))}));if("string"==typeof e&&e)for(t=e.match(z)||[];o=this[c++];)if(a=_t(o),n=1===o.nodeType&&(" "+a+" ").replace(Mt," ")){for(r=0;i=t[r++];)n.indexOf(" "+i+" ")<0&&(n+=i+" ");a!==(s=d.trim(n))&&d.attr(o,"class",s)}return this},removeClass:function(e){var t,o,n,a,i,r,s,c=0;if(d.isFunction(e))return this.each((function(t){d(this).removeClass(e.call(this,t,_t(this)))}));if(!arguments.length)return this.attr("class","");if("string"==typeof e&&e)for(t=e.match(z)||[];o=this[c++];)if(a=_t(o),n=1===o.nodeType&&(" "+a+" ").replace(Mt," ")){for(r=0;i=t[r++];)for(;n.indexOf(" "+i+" ")>-1;)n=n.replace(" "+i+" "," ");a!==(s=d.trim(n))&&d.attr(o,"class",s)}return this},toggleClass:function(e,t){var o=typeof e;return"boolean"==typeof t&&"string"===o?t?this.addClass(e):this.removeClass(e):d.isFunction(e)?this.each((function(o){d(this).toggleClass(e.call(this,o,_t(this),t),t)})):this.each((function(){var t,n,a,i;if("string"===o)for(n=0,a=d(this),i=e.match(z)||[];t=i[n++];)a.hasClass(t)?a.removeClass(t):a.addClass(t);else void 0!==e&&"boolean"!==o||((t=_t(this))&&d._data(this,"__className__",t),d.attr(this,"class",t||!1===e?"":d._data(this,"__className__")||""))}))},hasClass:function(e){var t,o,n=0;for(t=" "+e+" ";o=this[n++];)if(1===o.nodeType&&(" "+_t(o)+" ").replace(Mt," ").indexOf(t)>-1)return!0;return!1}}),d.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),(function(e,t){d.fn[t]=function(e,o){return arguments.length>0?this.on(t,null,e,o):this.trigger(t)}})),d.fn.extend({hover:function(e,t){return this.mouseenter(e).mouseleave(t||e)}});var Dt=e.location,Et=d.now(),Tt=/\?/,qt=/(,)|(\[|{)|(}|])|"(?:[^"\\\r\n]|\\["\\\/bfnrt]|\\u[\da-fA-F]{4})*"\s*:?|true|false|null|-?(?!0\d)\d+(?:\.\d+|)(?:[eE][+-]?\d+|)/g;d.parseJSON=function(t){if(e.JSON&&e.JSON.parse)return e.JSON.parse(t+"");var o,n=null,a=d.trim(t+"");return a&&!d.trim(a.replace(qt,(function(e,t,a,i){return o&&t&&(n=0),0===n?e:(o=a||t,n+=!i-!a,"")})))?Function("return "+a)():d.error("Invalid JSON: "+t)},d.parseXML=function(t){var o;if(!t||"string"!=typeof t)return null;try{e.DOMParser?o=(new e.DOMParser).parseFromString(t,"text/xml"):((o=new e.ActiveXObject("Microsoft.XMLDOM")).async="false",o.loadXML(t))}catch(e){o=void 0}return o&&o.documentElement&&!o.getElementsByTagName("parsererror").length||d.error("Invalid XML: "+t),o};var St=/#.*$/,zt=/([?&])_=[^&]*/,Vt=/^(.*?):[ \t]*([^\r\n]*)\r?$/gm,Bt=/^(?:GET|HEAD)$/,Rt=/^\/\//,Gt=/^([\w.+-]+:)(?:\/\/(?:[^\/?#]*@|)([^\/?#:]*)(?::(\d+)|)|)/,jt={},Ft={},Ht="*/".concat("*"),Nt=Dt.href,It=Gt.exec(Nt.toLowerCase())||[];function Pt(e){return function(t,o){"string"!=typeof t&&(o=t,t="*");var n,a=0,i=t.toLowerCase().match(z)||[];if(d.isFunction(o))for(;n=i[a++];)"+"===n.charAt(0)?(n=n.slice(1)||"*",(e[n]=e[n]||[]).unshift(o)):(e[n]=e[n]||[]).push(o)}}function Ot(e,t,o,n){var a={},i=e===Ft;function r(s){var c;return a[s]=!0,d.each(e[s]||[],(function(e,s){var m=s(t,o,n);return"string"!=typeof m||i||a[m]?i?!(c=m):void 0:(t.dataTypes.unshift(m),r(m),!1)})),c}return r(t.dataTypes[0])||!a["*"]&&r("*")}function Lt(e,t){var o,n,a=d.ajaxSettings.flatOptions||{};for(n in t)void 0!==t[n]&&((a[n]?e:o||(o={}))[n]=t[n]);return o&&d.extend(!0,e,o),e}function Ut(e){return e.style&&e.style.display||d.css(e,"display")}d.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:Nt,type:"GET",isLocal:/^(?:about|app|app-storage|.+-extension|file|res|widget):$/.test(It[1]),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":Ht,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/\bxml\b/,html:/\bhtml/,json:/\bjson\b/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":d.parseJSON,"text xml":d.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(e,t){return t?Lt(Lt(e,d.ajaxSettings),t):Lt(d.ajaxSettings,e)},ajaxPrefilter:Pt(jt),ajaxTransport:Pt(Ft),ajax:function(t,o){"object"==typeof t&&(o=t,t=void 0),o=o||{};var n,a,i,r,s,c,m,l,u=d.ajaxSetup({},o),h=u.context||u,p=u.context&&(h.nodeType||h.jquery)?d(h):d.event,g=d.Deferred(),f=d.Callbacks("once memory"),b=u.statusCode||{},v={},w={},y=0,k="canceled",C={readyState:0,getResponseHeader:function(e){var t;if(2===y){if(!l)for(l={};t=Vt.exec(r);)l[t[1].toLowerCase()]=t[2];t=l[e.toLowerCase()]}return null==t?null:t},getAllResponseHeaders:function(){return 2===y?r:null},setRequestHeader:function(e,t){var o=e.toLowerCase();return y||(e=w[o]=w[o]||e,v[e]=t),this},overrideMimeType:function(e){return y||(u.mimeType=e),this},statusCode:function(e){var t;if(e)if(y<2)for(t in e)b[t]=[b[t],e[t]];else C.always(e[C.status]);return this},abort:function(e){var t=e||k;return m&&m.abort(t),A(0,t),this}};if(g.promise(C).complete=f.add,C.success=C.done,C.error=C.fail,u.url=((t||u.url||Nt)+"").replace(St,"").replace(Rt,It[1]+"//"),u.type=o.method||o.type||u.method||u.type,u.dataTypes=d.trim(u.dataType||"*").toLowerCase().match(z)||[""],null==u.crossDomain&&(n=Gt.exec(u.url.toLowerCase()),u.crossDomain=!(!n||n[1]===It[1]&&n[2]===It[2]&&(n[3]||("http:"===n[1]?"80":"443"))===(It[3]||("http:"===It[1]?"80":"443")))),u.data&&u.processData&&"string"!=typeof u.data&&(u.data=d.param(u.data,u.traditional)),Ot(jt,u,o,C),2===y)return C;for(a in(c=d.event&&u.global)&&0==d.active++&&d.event.trigger("ajaxStart"),u.type=u.type.toUpperCase(),u.hasContent=!Bt.test(u.type),i=u.url,u.hasContent||(u.data&&(i=u.url+=(Tt.test(i)?"&":"?")+u.data,delete u.data),!1===u.cache&&(u.url=zt.test(i)?i.replace(zt,"$1_="+Et++):i+(Tt.test(i)?"&":"?")+"_="+Et++)),u.ifModified&&(d.lastModified[i]&&C.setRequestHeader("If-Modified-Since",d.lastModified[i]),d.etag[i]&&C.setRequestHeader("If-None-Match",d.etag[i])),(u.data&&u.hasContent&&!1!==u.contentType||o.contentType)&&C.setRequestHeader("Content-Type",u.contentType),C.setRequestHeader("Accept",u.dataTypes[0]&&u.accepts[u.dataTypes[0]]?u.accepts[u.dataTypes[0]]+("*"!==u.dataTypes[0]?", "+Ht+"; q=0.01":""):u.accepts["*"]),u.headers)C.setRequestHeader(a,u.headers[a]);if(u.beforeSend&&(!1===u.beforeSend.call(h,C,u)||2===y))return C.abort();for(a in k="abort",{success:1,error:1,complete:1})C[a](u[a]);if(m=Ot(Ft,u,o,C)){if(C.readyState=1,c&&p.trigger("ajaxSend",[C,u]),2===y)return C;u.async&&u.timeout>0&&(s=e.setTimeout((function(){C.abort("timeout")}),u.timeout));try{y=1,m.send(v,A)}catch(e){if(!(y<2))throw e;A(-1,e)}}else A(-1,"No Transport");function A(t,o,n,a){var l,v,w,k,A,x=o;2!==y&&(y=2,s&&e.clearTimeout(s),m=void 0,r=a||"",C.readyState=t>0?4:0,l=t>=200&&t<300||304===t,n&&(k=function(e,t,o){for(var n,a,i,r,s=e.contents,c=e.dataTypes;"*"===c[0];)c.shift(),void 0===a&&(a=e.mimeType||t.getResponseHeader("Content-Type"));if(a)for(r in s)if(s[r]&&s[r].test(a)){c.unshift(r);break}if(c[0]in o)i=c[0];else{for(r in o){if(!c[0]||e.converters[r+" "+c[0]]){i=r;break}n||(n=r)}i=i||n}if(i)return i!==c[0]&&c.unshift(i),o[i]}(u,C,n)),k=function(e,t,o,n){var a,i,r,s,c,m={},l=e.dataTypes.slice();if(l[1])for(r in e.converters)m[r.toLowerCase()]=e.converters[r];for(i=l.shift();i;)if(e.responseFields[i]&&(o[e.responseFields[i]]=t),!c&&n&&e.dataFilter&&(t=e.dataFilter(t,e.dataType)),c=i,i=l.shift())if("*"===i)i=c;else if("*"!==c&&c!==i){if(!(r=m[c+" "+i]||m["* "+i]))for(a in m)if((s=a.split(" "))[1]===i&&(r=m[c+" "+s[0]]||m["* "+s[0]])){!0===r?r=m[a]:!0!==m[a]&&(i=s[0],l.unshift(s[1]));break}if(!0!==r)if(r&&e.throws)t=r(t);else try{t=r(t)}catch(e){return{state:"parsererror",error:r?e:"No conversion from "+c+" to "+i}}}return{state:"success",data:t}}(u,k,C,l),l?(u.ifModified&&((A=C.getResponseHeader("Last-Modified"))&&(d.lastModified[i]=A),(A=C.getResponseHeader("etag"))&&(d.etag[i]=A)),204===t||"HEAD"===u.type?x="nocontent":304===t?x="notmodified":(x=k.state,v=k.data,l=!(w=k.error))):(w=x,!t&&x||(x="error",t<0&&(t=0))),C.status=t,C.statusText=(o||x)+"",l?g.resolveWith(h,[v,x,C]):g.rejectWith(h,[C,x,w]),C.statusCode(b),b=void 0,c&&p.trigger(l?"ajaxSuccess":"ajaxError",[C,u,l?v:w]),f.fireWith(h,[C,x]),c&&(p.trigger("ajaxComplete",[C,u]),--d.active||d.event.trigger("ajaxStop")))}return C},getJSON:function(e,t,o){return d.get(e,t,o,"json")},getScript:function(e,t){return d.get(e,void 0,t,"script")}}),d.each(["get","post"],(function(e,t){d[t]=function(e,o,n,a){return d.isFunction(o)&&(a=a||n,n=o,o=void 0),d.ajax(d.extend({url:e,type:t,dataType:a,data:o,success:n},d.isPlainObject(e)&&e))}})),d._evalUrl=function(e){return d.ajax({url:e,type:"GET",dataType:"script",cache:!0,async:!1,global:!1,throws:!0})},d.fn.extend({wrapAll:function(e){if(d.isFunction(e))return this.each((function(t){d(this).wrapAll(e.call(this,t))}));if(this[0]){var t=d(e,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&t.insertBefore(this[0]),t.map((function(){for(var e=this;e.firstChild&&1===e.firstChild.nodeType;)e=e.firstChild;return e})).append(this)}return this},wrapInner:function(e){return d.isFunction(e)?this.each((function(t){d(this).wrapInner(e.call(this,t))})):this.each((function(){var t=d(this),o=t.contents();o.length?o.wrapAll(e):t.append(e)}))},wrap:function(e){var t=d.isFunction(e);return this.each((function(o){d(this).wrapAll(t?e.call(this,o):e)}))},unwrap:function(){return this.parent().each((function(){d.nodeName(this,"body")||d(this).replaceWith(this.childNodes)})).end()}}),d.expr.filters.hidden=function(e){return u.reliableHiddenOffsets()?e.offsetWidth<=0&&e.offsetHeight<=0&&!e.getClientRects().length:function(e){if(!d.contains(e.ownerDocument||n,e))return!0;for(;e&&1===e.nodeType;){if("none"===Ut(e)||"hidden"===e.type)return!0;e=e.parentNode}return!1}(e)},d.expr.filters.visible=function(e){return!d.expr.filters.hidden(e)};var Wt=/%20/g,$t=/\[\]$/,Qt=/\r?\n/g,Kt=/^(?:submit|button|image|reset|file)$/i,Jt=/^(?:input|select|textarea|keygen)/i;function Yt(e,t,o,n){var a;if(d.isArray(t))d.each(t,(function(t,a){o||$t.test(e)?n(e,a):Yt(e+"["+("object"==typeof a&&null!=a?t:"")+"]",a,o,n)}));else if(o||"object"!==d.type(t))n(e,t);else for(a in t)Yt(e+"["+a+"]",t[a],o,n)}d.param=function(e,t){var o,n=[],a=function(e,t){t=d.isFunction(t)?t():null==t?"":t,n[n.length]=encodeURIComponent(e)+"="+encodeURIComponent(t)};if(void 0===t&&(t=d.ajaxSettings&&d.ajaxSettings.traditional),d.isArray(e)||e.jquery&&!d.isPlainObject(e))d.each(e,(function(){a(this.name,this.value)}));else for(o in e)Yt(o,e[o],t,a);return n.join("&").replace(Wt,"+")},d.fn.extend({serialize:function(){return d.param(this.serializeArray())},serializeArray:function(){return this.map((function(){var e=d.prop(this,"elements");return e?d.makeArray(e):this})).filter((function(){var e=this.type;return this.name&&!d(this).is(":disabled")&&Jt.test(this.nodeName)&&!Kt.test(e)&&(this.checked||!Z.test(e))})).map((function(e,t){var o=d(this).val();return null==o?null:d.isArray(o)?d.map(o,(function(e){return{name:t.name,value:e.replace(Qt,"\r\n")}})):{name:t.name,value:o.replace(Qt,"\r\n")}})).get()}}),d.ajaxSettings.xhr=void 0!==e.ActiveXObject?function(){return this.isLocal?oo():n.documentMode>8?to():/^(get|post|head|put|delete|options)$/i.test(this.type)&&to()||oo()}:to;var Zt=0,Xt={},eo=d.ajaxSettings.xhr();function to(){try{return new e.XMLHttpRequest}catch(e){}}function oo(){try{return new e.ActiveXObject("Microsoft.XMLHTTP")}catch(e){}}e.attachEvent&&e.attachEvent("onunload",(function(){for(var e in Xt)Xt[e](void 0,!0)})),u.cors=!!eo&&"withCredentials"in eo,(eo=u.ajax=!!eo)&&d.ajaxTransport((function(t){var o;if(!t.crossDomain||u.cors)return{send:function(n,a){var i,r=t.xhr(),s=++Zt;if(r.open(t.type,t.url,t.async,t.username,t.password),t.xhrFields)for(i in t.xhrFields)r[i]=t.xhrFields[i];for(i in t.mimeType&&r.overrideMimeType&&r.overrideMimeType(t.mimeType),t.crossDomain||n["X-Requested-With"]||(n["X-Requested-With"]="XMLHttpRequest"),n)void 0!==n[i]&&r.setRequestHeader(i,n[i]+"");r.send(t.hasContent&&t.data||null),o=function(e,n){var i,c,m;if(o&&(n||4===r.readyState))if(delete Xt[s],o=void 0,r.onreadystatechange=d.noop,n)4!==r.readyState&&r.abort();else{m={},i=r.status,"string"==typeof r.responseText&&(m.text=r.responseText);try{c=r.statusText}catch(e){c=""}i||!t.isLocal||t.crossDomain?1223===i&&(i=204):i=m.text?200:404}m&&a(i,c,m,r.getAllResponseHeaders())},t.async?4===r.readyState?e.setTimeout(o):r.onreadystatechange=Xt[s]=o:o()},abort:function(){o&&o(void 0,!0)}}})),d.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/\b(?:java|ecma)script\b/},converters:{"text script":function(e){return d.globalEval(e),e}}}),d.ajaxPrefilter("script",(function(e){void 0===e.cache&&(e.cache=!1),e.crossDomain&&(e.type="GET",e.global=!1)})),d.ajaxTransport("script",(function(e){if(e.crossDomain){var t,o=n.head||d("head")[0]||n.documentElement;return{send:function(a,i){(t=n.createElement("script")).async=!0,e.scriptCharset&&(t.charset=e.scriptCharset),t.src=e.url,t.onload=t.onreadystatechange=function(e,o){(o||!t.readyState||/loaded|complete/.test(t.readyState))&&(t.onload=t.onreadystatechange=null,t.parentNode&&t.parentNode.removeChild(t),t=null,o||i(200,"success"))},o.insertBefore(t,o.firstChild)},abort:function(){t&&t.onload(void 0,!0)}}}}));var no=[],ao=/(=)\?(?=&|$)|\?\?/;d.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=no.pop()||d.expando+"_"+Et++;return this[e]=!0,e}}),d.ajaxPrefilter("json jsonp",(function(t,o,n){var a,i,r,s=!1!==t.jsonp&&(ao.test(t.url)?"url":"string"==typeof t.data&&0===(t.contentType||"").indexOf("application/x-www-form-urlencoded")&&ao.test(t.data)&&"data");if(s||"jsonp"===t.dataTypes[0])return a=t.jsonpCallback=d.isFunction(t.jsonpCallback)?t.jsonpCallback():t.jsonpCallback,s?t[s]=t[s].replace(ao,"$1"+a):!1!==t.jsonp&&(t.url+=(Tt.test(t.url)?"&":"?")+t.jsonp+"="+a),t.converters["script json"]=function(){return r||d.error(a+" was not called"),r[0]},t.dataTypes[0]="json",i=e[a],e[a]=function(){r=arguments},n.always((function(){void 0===i?d(e).removeProp(a):e[a]=i,t[a]&&(t.jsonpCallback=o.jsonpCallback,no.push(a)),r&&d.isFunction(i)&&i(r[0]),r=i=void 0})),"script"})),d.parseHTML=function(e,t,o){if(!e||"string"!=typeof e)return null;"boolean"==typeof t&&(o=t,t=!1),t=t||n;var a=C.exec(e),i=!o&&[];return a?[t.createElement(a[1])]:(a=le([e],t,i),i&&i.length&&d(i).remove(),d.merge([],a.childNodes))};var io=d.fn.load;function ro(e){return d.isWindow(e)?e:9===e.nodeType&&(e.defaultView||e.parentWindow)}d.fn.load=function(e,t,o){if("string"!=typeof e&&io)return io.apply(this,arguments);var n,a,i,r=this,s=e.indexOf(" ");return s>-1&&(n=d.trim(e.slice(s,e.length)),e=e.slice(0,s)),d.isFunction(t)?(o=t,t=void 0):t&&"object"==typeof t&&(a="POST"),r.length>0&&d.ajax({url:e,type:a||"GET",dataType:"html",data:t}).done((function(e){i=arguments,r.html(n?d("<div>").append(d.parseHTML(e)).find(n):e)})).always(o&&function(e,t){r.each((function(){o.apply(this,i||[e.responseText,t,e])}))}),this},d.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],(function(e,t){d.fn[t]=function(e){return this.on(t,e)}})),d.expr.filters.animated=function(e){return d.grep(d.timers,(function(t){return e===t.elem})).length},d.offset={setOffset:function(e,t,o){var n,a,i,r,s,c,m=d.css(e,"position"),l=d(e),u={};"static"===m&&(e.style.position="relative"),s=l.offset(),i=d.css(e,"top"),c=d.css(e,"left"),("absolute"===m||"fixed"===m)&&d.inArray("auto",[i,c])>-1?(r=(n=l.position()).top,a=n.left):(r=parseFloat(i)||0,a=parseFloat(c)||0),d.isFunction(t)&&(t=t.call(e,o,d.extend({},s))),null!=t.top&&(u.top=t.top-s.top+r),null!=t.left&&(u.left=t.left-s.left+a),"using"in t?t.using.call(e,u):l.css(u)}},d.fn.extend({offset:function(e){if(arguments.length)return void 0===e?this:this.each((function(t){d.offset.setOffset(this,e,t)}));var t,o,n={top:0,left:0},a=this[0],i=a&&a.ownerDocument;return i?(t=i.documentElement,d.contains(t,a)?(void 0!==a.getBoundingClientRect&&(n=a.getBoundingClientRect()),o=ro(i),{top:n.top+(o.pageYOffset||t.scrollTop)-(t.clientTop||0),left:n.left+(o.pageXOffset||t.scrollLeft)-(t.clientLeft||0)}):n):void 0},position:function(){if(this[0]){var e,t,o={top:0,left:0},n=this[0];return"fixed"===d.css(n,"position")?t=n.getBoundingClientRect():(e=this.offsetParent(),t=this.offset(),d.nodeName(e[0],"html")||(o=e.offset()),o.top+=d.css(e[0],"borderTopWidth",!0),o.left+=d.css(e[0],"borderLeftWidth",!0)),{top:t.top-o.top-d.css(n,"marginTop",!0),left:t.left-o.left-d.css(n,"marginLeft",!0)}}},offsetParent:function(){return this.map((function(){for(var e=this.offsetParent;e&&!d.nodeName(e,"html")&&"static"===d.css(e,"position");)e=e.offsetParent;return e||Pe}))}}),d.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},(function(e,t){var o=/Y/.test(t);d.fn[e]=function(n){return Y(this,(function(e,n,a){var i=ro(e);if(void 0===a)return i?t in i?i[t]:i.document.documentElement[n]:e[n];i?i.scrollTo(o?d(i).scrollLeft():a,o?a:d(i).scrollTop()):e[n]=a}),e,n,arguments.length,null)}})),d.each(["top","left"],(function(e,t){d.cssHooks[t]=We(u.pixelPosition,(function(e,o){if(o)return o=Le(e,t),Ne.test(o)?d(e).position()[t]+"px":o}))})),d.each({Height:"height",Width:"width"},(function(e,t){d.each({padding:"inner"+e,content:t,"":"outer"+e},(function(o,n){d.fn[n]=function(n,a){var i=arguments.length&&(o||"boolean"!=typeof n),r=o||(!0===n||!0===a?"margin":"border");return Y(this,(function(t,o,n){var a;return d.isWindow(t)?t.document.documentElement["client"+e]:9===t.nodeType?(a=t.documentElement,Math.max(t.body["scroll"+e],a["scroll"+e],t.body["offset"+e],a["offset"+e],a["client"+e])):void 0===n?d.css(t,o,r):d.style(t,o,n,r)}),t,i?n:void 0,i,null)}}))})),d.fn.extend({bind:function(e,t,o){return this.on(e,null,t,o)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,o,n){return this.on(t,e,o,n)},undelegate:function(e,t,o){return 1===arguments.length?this.off(e,"**"):this.off(t,e||"**",o)}}),d.fn.size=function(){return this.length},d.fn.andSelf=d.fn.addBack,"function"==typeof define&&define.amd&&define("jquery",[],(function(){return d}));var so=e.jQuery,co=e.$;return d.noConflict=function(t){return e.$===d&&(e.$=co),t&&e.jQuery===d&&(e.jQuery=so),d},t||(e.jQuery=e.$=d),d}))},{}],9:[function(e,t,o){o.markdown=e("./markdown"),o.parse=o.markdown.toHTML},{"./markdown":10}],10:[function(e,t,o){!function(t){var o=t.Markdown=function(e){switch(typeof e){case"undefined":this.dialect=o.dialects.Gruber;break;case"object":this.dialect=e;break;default:if(!(e in o.dialects))throw new Error("Unknown Markdown dialect '"+String(e)+"'");this.dialect=o.dialects[e]}this.em_state=[],this.strong_state=[],this.debug_indent=""};function n(){return"Markdown.mk_block( "+uneval(this.toString())+", "+uneval(this.trailing)+", "+uneval(this.lineNumber)+" )"}function i(){var t=e("util");return"Markdown.mk_block( "+t.inspect(this.toString())+", "+t.inspect(this.trailing)+", "+t.inspect(this.lineNumber)+" )"}t.parse=function(e,t){return new o(t).toTree(e)},t.toHTML=function(e,o,n){var a=t.toHTMLTree(e,o,n);return t.renderJsonML(a)},t.toHTMLTree=function(e,t,o){"string"==typeof e&&(e=this.parse(e,t));var n=d(e),a={};n&&n.references&&(a=n.references);var i=function e(t,o,n){var a;n=n||{};var i=t.slice(0);"function"==typeof n.preprocessTreeNode&&(i=n.preprocessTreeNode(i,o));var r=d(i);if(r){for(a in i[1]={},r)i[1][a]=r[a];r=i[1]}if("string"==typeof i)return i;switch(i[0]){case"header":i[0]="h"+i[1].level,delete i[1].level;break;case"bulletlist":i[0]="ul";break;case"numberlist":i[0]="ol";break;case"listitem":i[0]="li";break;case"para":i[0]="p";break;case"markdown":i[0]="html",r&&delete r.references;break;case"code_block":i[0]="pre",a=r?2:1;var s=["code"];s.push.apply(s,i.splice(a,i.length-a)),i[a]=s;break;case"inlinecode":i[0]="code";break;case"img":i[1].src=i[1].href,delete i[1].href;break;case"linebreak":i[0]="br";break;case"link":i[0]="a";break;case"link_ref":if(i[0]="a",!(c=o[r.ref]))return r.original;delete r.ref,r.href=c.href,c.title&&(r.title=c.title),delete r.original;break;case"img_ref":var c;if(i[0]="img",!(c=o[r.ref]))return r.original;delete r.ref,r.src=c.href,c.title&&(r.title=c.title),delete r.original}if(a=1,r){for(var m in i[1]){a=2;break}1===a&&i.splice(a,1)}for(;a<i.length;++a)i[a]=e(i[a],o,n);return i}(e,a,o);return function e(t){var o=d(t)?2:1;for(;o<t.length;)"string"==typeof t[o]?o+1<t.length&&"string"==typeof t[o+1]?t[o]+=t.splice(o+1,1)[0]:++o:(e(t[o]),++o)}(i),i};var r=o.mk_block=function(e,t,o){1==arguments.length&&(t="\n\n");var a=new String(e);return a.trailing=t,a.inspect=i,a.toSource=n,null!=o&&(a.lineNumber=o),a};function s(e){for(var t=0,o=-1;-1!==(o=e.indexOf("\n",o+1));)t++;return t}function c(e,t){var o=e+"_state",n="strong"==e?"em_state":"strong_state";function a(e){this.len_after=e,this.name="close_"+t}return function(i,r){if(this[o][0]==t)return this[o].shift(),[i.length,new a(i.length-t.length)];var s=this[n].slice(),c=this[o].slice();this[o].unshift(t);var m=this.processInline(i.substr(t.length)),l=m[m.length-1];this[o].shift();return l instanceof a?(m.pop(),[i.length-l.len_after,[e].concat(m)]):(this[n]=s,this[o]=c,[t.length,t])}}o.prototype.split_blocks=function(e,t){e=e.replace(/(\r\n|\n|\r)/g,"\n");var o,n=/([\s\S]+?)($|\n#|\n(?:\s*\n|$)+)/g,a=[],i=1;for(null!=(o=/^(\s*\n)/.exec(e))&&(i+=s(o[0]),n.lastIndex=o[0].length);null!==(o=n.exec(e));)"\n#"==o[2]&&(o[2]="\n",n.lastIndex--),a.push(r(o[1],o[2],i)),i+=s(o[0]);return a},o.prototype.processBlock=function(e,t){var o=this.dialect.block,n=o.__order__;if("__call__"in o)return o.__call__.call(this,e,t);for(var a=0;a<n.length;a++){var i=o[n[a]].call(this,e,t);if(i)return(!l(i)||i.length>0&&!l(i[0]))&&this.debug(n[a],"didn't return a proper array"),i}return[]},o.prototype.processInline=function(e){return this.dialect.inline.__call__.call(this,String(e))},o.prototype.toTree=function(e,t){var o=e instanceof Array?e:this.split_blocks(e),n=this.tree;try{for(this.tree=t||this.tree||["markdown"];o.length;){var a=this.processBlock(o.shift(),o);a.length&&this.tree.push.apply(this.tree,a)}return this.tree}finally{t&&(this.tree=n)}},o.prototype.debug=function(){var e=Array.prototype.slice.call(arguments);e.unshift(this.debug_indent),"undefined"!=typeof print&&print.apply(print,e),"undefined"!=typeof console&&void 0!==console.log&&console.log.apply(null,e)},o.prototype.loop_re_over_block=function(e,t,o){for(var n,a=t.valueOf();a.length&&null!=(n=e.exec(a));)a=a.substr(n[0].length),o.call(this,n);return a},o.dialects={},o.dialects.Gruber={block:{atxHeader:function(e,t){var o=e.match(/^(#{1,6})\s*(.*?)\s*#*\s*(?:\n|$)/);if(o){var n=["header",{level:o[1].length}];return Array.prototype.push.apply(n,this.processInline(o[2])),o[0].length<e.length&&t.unshift(r(e.substr(o[0].length),e.trailing,e.lineNumber+2)),[n]}},setextHeader:function(e,t){var o=e.match(/^(.*)\n([-=])\2\2+(?:\n|$)/);if(o){var n=["header",{level:"="===o[2]?1:2},o[1]];return o[0].length<e.length&&t.unshift(r(e.substr(o[0].length),e.trailing,e.lineNumber+2)),[n]}},code:function(e,t){var o=[],n=/^(?: {0,3}\t| {4})(.*)\n?/;if(e.match(n)){e:for(;;){var a=this.loop_re_over_block(n,e.valueOf(),(function(e){o.push(e[1])}));if(a.length){t.unshift(r(a,e.trailing));break e}if(!t.length)break e;if(!t[0].match(n))break e;o.push(e.trailing.replace(/[^\n]/g,"").substring(2)),e=t.shift()}return[["code_block",o.join("\n")]]}},horizRule:function(e,t){var o=e.match(/^(?:([\s\S]*?)\n)?[ \t]*([-_*])(?:[ \t]*\2){2,}[ \t]*(?:\n([\s\S]*))?$/);if(o){var n=[["hr"]];return o[1]&&n.unshift.apply(n,this.processBlock(o[1],[])),o[3]&&t.unshift(r(o[3])),n}},lists:function(){var e=/[*+-]/,t=new RegExp("^( {0,3})([*+-]|\\d+\\.)[ \t]+"),o="(?: {0,3}\\t| {4})";function n(e,t,o,n){if(t)e.push(["para"].concat(o));else{var a=e[e.length-1]instanceof Array&&"para"==e[e.length-1][0]?e[e.length-1]:e;n&&e.length>1&&o.unshift(n);for(var i=0;i<o.length;i++){var r=o[i];"string"==typeof r&&a.length>1&&"string"==typeof a[a.length-1]?a[a.length-1]+=r:a.push(r)}}}function a(e,t){for(var n=new RegExp("^("+o+"{"+e+"}.*?\\n?)*$"),a=new RegExp("^"+o+"{"+e+"}","gm"),i=[];t.length>0&&n.exec(t[0]);){var s=t.shift(),c=s.replace(a,"");i.push(r(c,s.trailing,s.lineNumber))}return i}function i(e,t,o){var n=e.list,a=n[n.length-1];if(!(a[1]instanceof Array&&"para"==a[1][0]))if(t+1==o.length)a.push(["para"].concat(a.splice(1,a.length-1)));else{var i=a.pop();a.push(["para"].concat(a.splice(1,a.length-1)),i)}}return function(r,s){var c=r.match(t);if(c){for(var l,u,d,h=[],p=E(c),g=!1,f=[h[0].list];;){for(var b=r.split(/(?=\n)/),v="",w=0;w<b.length;w++){var y="",k=b[w].replace(/^\n/,(function(e){return y=e,""})),C=(d=h.length,new RegExp("(?:^("+o+"{0,"+d+"} {0,3})([*+-]|\\d+\\.)\\s+)|(^"+o+"{0,"+(d-1)+"}[ ]{0,4})"));if(void 0!==(c=k.match(C))[1]){v.length&&(n(l,g,this.processInline(v),y),g=!1,v=""),c[1]=c[1].replace(/ {0,3}\t/g,"    ");var A=Math.floor(c[1].length/4)+1;if(A>h.length)p=E(c),l.push(p),l=p[1]=["listitem"];else{var x=!1;for(u=0;u<h.length;u++)if(h[u].indent==c[1]){p=h[u].list,h.splice(u+1,h.length-(u+1)),x=!0;break}x||(++A<=h.length?(h.splice(A,h.length-A),p=h[A-1].list):(p=E(c),l.push(p))),l=["listitem"],p.push(l)}y=""}k.length>c[0].length&&(v+=y+k.substr(c[0].length))}v.length&&(n(l,g,this.processInline(v),y),g=!1,v="");var M=a(h.length,s);M.length>0&&(m(h,i,this),l.push.apply(l,this.toTree(M,[])));var _=s[0]&&s[0].valueOf()||"";if(!_.match(t)&&!_.match(/^ /))break;r=s.shift();var D=this.dialect.block.horizRule(r,s);if(D){f.push.apply(f,D);break}m(h,i,this),g=!0}return f}function E(t){var o=e.exec(t[2])?["bulletlist"]:["numberlist"];return h.push({list:o,indent:t[1]}),o}}}(),blockquote:function(e,t){if(e.match(/^>/m)){var o=[];if(">"!=e[0]){for(var n=e.split(/\n/),a=[],i=e.lineNumber;n.length&&">"!=n[0][0];)a.push(n.shift()),i++;var s=r(a.join("\n"),"\n",e.lineNumber);o.push.apply(o,this.processBlock(s,[])),e=r(n.join("\n"),e.trailing,i)}for(;t.length&&">"==t[0][0];){var c=t.shift();e=r(e+e.trailing+c,c.trailing,e.lineNumber)}var m=e.replace(/^> ?/gm,""),l=(this.tree,this.toTree(m,["blockquote"])),h=d(l);return h&&h.references&&(delete h.references,u(h)&&l.splice(1,1)),o.push(l),o}},referenceDefn:function(e,t){var o=/^\s*\[(.*?)\]:\s*(\S+)(?:\s+(?:(['"])(.*?)\3|\((.*?)\)))?\n?/;if(e.match(o)){d(this.tree)||this.tree.splice(1,0,{});var n=d(this.tree);void 0===n.references&&(n.references={});var a=this.loop_re_over_block(o,e,(function(e){e[2]&&"<"==e[2][0]&&">"==e[2][e[2].length-1]&&(e[2]=e[2].substring(1,e[2].length-1));var t=n.references[e[1].toLowerCase()]={href:e[2]};void 0!==e[4]?t.title=e[4]:void 0!==e[5]&&(t.title=e[5])}));return a.length&&t.unshift(r(a,e.trailing)),[]}},para:function(e,t){return[["para"].concat(this.processInline(e))]}}},o.dialects.Gruber.inline={__oneElement__:function(e,t,o){var n,a;return t=t||this.dialect.inline.__patterns__,(n=new RegExp("([\\s\\S]*?)("+(t.source||t)+")").exec(e))?n[1]?[n[1].length,n[1]]:(n[2]in this.dialect.inline&&(a=this.dialect.inline[n[2]].call(this,e.substr(n.index),n,o||[])),a=a||[n[2].length,n[2]]):[e.length,e]},__call__:function(e,t){var o,n=[];function a(e){"string"==typeof e&&"string"==typeof n[n.length-1]?n[n.length-1]+=e:n.push(e)}for(;e.length>0;)o=this.dialect.inline.__oneElement__.call(this,e,t,n),e=e.substr(o.shift()),m(o,a);return n},"]":function(){},"}":function(){},__escape__:/^\\[\\`\*_{}\[\]()#\+.!\-]/,"\\":function(e){return this.dialect.inline.__escape__.exec(e)?[2,e.charAt(1)]:[1,"\\"]},"![":function(e){var t=e.match(/^!\[(.*?)\][ \t]*\([ \t]*([^")]*?)(?:[ \t]+(["'])(.*?)\3)?[ \t]*\)/);if(t){t[2]&&"<"==t[2][0]&&">"==t[2][t[2].length-1]&&(t[2]=t[2].substring(1,t[2].length-1)),t[2]=this.dialect.inline.__call__.call(this,t[2],/\\/)[0];var o={alt:t[1],href:t[2]||""};return void 0!==t[4]&&(o.title=t[4]),[t[0].length,["img",o]]}return(t=e.match(/^!\[(.*?)\][ \t]*\[(.*?)\]/))?[t[0].length,["img_ref",{alt:t[1],ref:t[2].toLowerCase(),original:t[0]}]]:[2,"!["]},"[":function(e){var t=String(e),n=o.DialectHelpers.inline_until_char.call(this,e.substr(1),"]");if(!n)return[1,"["];var a,i,r=1+n[0],s=n[1],c=(e=e.substr(r)).match(/^\s*\([ \t]*([^"']*)(?:[ \t]+(["'])(.*?)\2)?[ \t]*\)/);if(c){var m=c[1];if(r+=c[0].length,m&&"<"==m[0]&&">"==m[m.length-1]&&(m=m.substring(1,m.length-1)),!c[3])for(var l=1,u=0;u<m.length;u++)switch(m[u]){case"(":l++;break;case")":0==--l&&(r-=m.length-u,m=m.substring(0,u))}return i={href:(m=this.dialect.inline.__call__.call(this,m,/\\/)[0])||""},void 0!==c[3]&&(i.title=c[3]),a=["link",i].concat(s),[r,a]}return(c=e.match(/^\s*\[(.*?)\]/))?(r+=c[0].length,a=["link_ref",i={ref:(c[1]||String(s)).toLowerCase(),original:t.substr(0,r)}].concat(s),[r,a]):1==s.length&&"string"==typeof s[0]?(a=["link_ref",i={ref:s[0].toLowerCase(),original:t.substr(0,r)},s[0]],[r,a]):[1,"["]},"<":function(e){var t;return null!=(t=e.match(/^<(?:((https?|ftp|mailto):[^>]+)|(.*?@.*?\.[a-zA-Z]+))>/))?t[3]?[t[0].length,["link",{href:"mailto:"+t[3]},t[3]]]:"mailto"==t[2]?[t[0].length,["link",{href:t[1]},t[1].substr("mailto:".length)]]:[t[0].length,["link",{href:t[1]},t[1]]]:[1,"<"]},"`":function(e){var t=e.match(/(`+)(([\s\S]*?)\1)/);return t&&t[2]?[t[1].length+t[2].length,["inlinecode",t[3]]]:[1,"`"]},"  \n":function(e){return[3,["linebreak"]]}},o.dialects.Gruber.inline["**"]=c("strong","**"),o.dialects.Gruber.inline.__=c("strong","__"),o.dialects.Gruber.inline["*"]=c("em","*"),o.dialects.Gruber.inline._=c("em","_"),o.buildBlockOrder=function(e){var t=[];for(var o in e)"__order__"!=o&&"__call__"!=o&&t.push(o);e.__order__=t},o.buildInlinePatterns=function(e){var t=[];for(var o in e)if(!o.match(/^__.*__$/)){var n=o.replace(/([\\.*+?|()\[\]{}])/g,"\\$1").replace(/\n/,"\\n");t.push(1==o.length?n:"(?:"+n+")")}t=t.join("|"),e.__patterns__=t;var a=e.__call__;e.__call__=function(e,o){return null!=o?a.call(this,e,o):a.call(this,e,t)}},o.DialectHelpers={},o.DialectHelpers.inline_until_char=function(e,t){for(var o=0,n=[];;){if(e.charAt(o)==t)return[++o,n];if(o>=e.length)return null;var a=this.dialect.inline.__oneElement__.call(this,e.substr(o));o+=a[0],n.push.apply(n,a.slice(1))}},o.subclassDialect=function(e){function t(){}function o(){}return t.prototype=e.block,o.prototype=e.inline,{block:new t,inline:new o}},o.buildBlockOrder(o.dialects.Gruber.block),o.buildInlinePatterns(o.dialects.Gruber.inline),o.dialects.Maruku=o.subclassDialect(o.dialects.Gruber),o.dialects.Maruku.processMetaHash=function(e){for(var t=function(e){var t=e.split(""),o=[""],n=!1;for(;t.length;){var a=t.shift();switch(a){case" ":n?o[o.length-1]+=a:o.push("");break;case"'":case'"':n=!n;break;case"\\":a=t.shift();default:o[o.length-1]+=a}}return o}(e),o={},n=0;n<t.length;++n)if(/^#/.test(t[n]))o.id=t[n].substring(1);else if(/^\./.test(t[n]))o.class?o.class=o.class+t[n].replace(/./," "):o.class=t[n].substring(1);else if(/\=/.test(t[n])){var a=t[n].split(/\=/);o[a[0]]=a[1]}return o},o.dialects.Maruku.block.document_meta=function(e,t){if(!(e.lineNumber>1)&&e.match(/^(?:\w+:.*\n)*\w+:.*$/)){d(this.tree)||this.tree.splice(1,0,{});var o=e.split(/\n/);for(p in o){var n=o[p].match(/(\w+):\s*(.*)$/),a=n[1].toLowerCase(),i=n[2];this.tree[1][a]=i}return[]}},o.dialects.Maruku.block.block_meta=function(e,t){var o=e.match(/(^|\n) {0,3}\{:\s*((?:\\\}|[^\}])*)\s*\}$/);if(o){var n,i=this.dialect.processMetaHash(o[2]);if(""===o[1]){var r=this.tree[this.tree.length-1];if(n=d(r),"string"==typeof r)return;for(a in n||(n={},r.splice(1,0,n)),i)n[a]=i[a];return[]}var s=e.replace(/\n.*$/,""),c=this.processBlock(s,[]);for(a in(n=d(c[0]))||(n={},c[0].splice(1,0,n)),i)n[a]=i[a];return c}},o.dialects.Maruku.block.definition_list=function(e,t){var o,n=/^((?:[^\s:].*\n)+):\s+([\s\S]+)$/,a=["dl"];if(s=e.match(n)){for(var i=[e];t.length&&n.exec(t[0]);)i.push(t.shift());for(var r=0;r<i.length;++r){var s,c=(s=i[r].match(n))[1].replace(/\n$/,"").split(/\n/),m=s[2].split(/\n:\s+/);for(o=0;o<c.length;++o)a.push(["dt",c[o]]);for(o=0;o<m.length;++o)a.push(["dd"].concat(this.processInline(m[o].replace(/(\n)\s+/,"$1"))))}return[a]}},o.dialects.Maruku.block.table=function(e,t){var o,n,a=function(e,t){(t=t||"\\s").match(/^[\\|\[\]{}?*.+^$]$/)&&(t="\\"+t);for(var o,n=[],a=new RegExp("^((?:\\\\.|[^\\\\"+t+"])*)"+t+"(.*)");o=e.match(a);)n.push(o[1]),e=o[2];return n.push(e),n};if(n=e.match(/^ {0,3}\|(.+)\n {0,3}\|\s*([\-:]+[\-| :]*)\n((?:\s*\|.*(?:\n|$))*)(?=\n|$)/))n[3]=n[3].replace(/^\s*\|/gm,"");else if(!(n=e.match(/^ {0,3}(\S(?:\\.|[^\\|])*\|.*)\n {0,3}([\-:]+\s*\|[\-| :]*)\n((?:(?:\\.|[^\\|])*\|.*(?:\n|$))*)(?=\n|$)/)))return;var i=["table",["thead",["tr"]],["tbody"]];n[2]=n[2].replace(/\|\s*$/,"").split("|");var r=[];for(m(n[2],(function(e){e.match(/^\s*-+:\s*$/)?r.push({align:"right"}):e.match(/^\s*:-+\s*$/)?r.push({align:"left"}):e.match(/^\s*:-+:\s*$/)?r.push({align:"center"}):r.push({})})),n[1]=a(n[1].replace(/\|\s*$/,""),"|"),o=0;o<n[1].length;o++)i[1][1].push(["th",r[o]||{}].concat(this.processInline(n[1][o].trim())));return m(n[3].replace(/\|\s*$/gm,"").split("\n"),(function(e){var t=["tr"];for(e=a(e,"|"),o=0;o<e.length;o++)t.push(["td",r[o]||{}].concat(this.processInline(e[o].trim())));i[2].push(t)}),this),[i]},o.dialects.Maruku.inline["{:"]=function(e,t,o){if(!o.length)return[2,"{:"];var n=o[o.length-1];if("string"==typeof n)return[2,"{:"];var a=e.match(/^\{:\s*((?:\\\}|[^\}])*)\s*\}/);if(!a)return[2,"{:"];var i=this.dialect.processMetaHash(a[1]),r=d(n);for(var s in r||(r={},n.splice(1,0,r)),i)r[s]=i[s];return[a[0].length,""]},o.dialects.Maruku.inline.__escape__=/^\\[\\`\*_{}\[\]()#\+.!\-|:]/,o.buildBlockOrder(o.dialects.Maruku.block),o.buildInlinePatterns(o.dialects.Maruku.inline);var m,l=Array.isArray||function(e){return"[object Array]"==Object.prototype.toString.call(e)};m=Array.prototype.forEach?function(e,t,o){return e.forEach(t,o)}:function(e,t,o){for(var n=0;n<e.length;n++)t.call(o||e,e[n],n,e)};var u=function(e){for(var t in e)if(hasOwnProperty.call(e,t))return!1;return!0};function d(e){return l(e)&&e.length>1&&"object"==typeof e[1]&&!l(e[1])?e[1]:void 0}function h(e){return e.replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/"/g,"&quot;").replace(/'/g,"&#39;")}function g(e){if("string"==typeof e)return h(e);var t=e.shift(),o={},n=[];for(!e.length||"object"!=typeof e[0]||e[0]instanceof Array||(o=e.shift());e.length;)n.push(g(e.shift()));var a="";for(var i in o)a+=" "+i+'="'+h(o[i])+'"';return"img"==t||"br"==t||"hr"==t?"<"+t+a+"/>":"<"+t+a+">"+n.join("")+"</"+t+">"}t.renderJsonML=function(e,t){(t=t||{}).root=t.root||!1;var o=[];if(t.root)o.push(g(e));else for(e.shift(),!e.length||"object"!=typeof e[0]||e[0]instanceof Array||e.shift();e.length;)o.push(g(e.shift()));return o.join("\n\n")}}(void 0===o?(window.markdown={},window.markdown):o)},{util:39}],11:[function(e,t,o){
/*
object-assign
(c) Sindre Sorhus
@license MIT
*/
"use strict";var n=Object.getOwnPropertySymbols,a=Object.prototype.hasOwnProperty,i=Object.prototype.propertyIsEnumerable;function r(e){if(null==e)throw new TypeError("Object.assign cannot be called with null or undefined");return Object(e)}t.exports=function(){try{if(!Object.assign)return!1;var e=new String("abc");if(e[5]="de","5"===Object.getOwnPropertyNames(e)[0])return!1;for(var t={},o=0;o<10;o++)t["_"+String.fromCharCode(o)]=o;if("0123456789"!==Object.getOwnPropertyNames(t).map((function(e){return t[e]})).join(""))return!1;var n={};return"abcdefghijklmnopqrst".split("").forEach((function(e){n[e]=e})),"abcdefghijklmnopqrst"===Object.keys(Object.assign({},n)).join("")}catch(e){return!1}}()?Object.assign:function(e,t){for(var o,s,c=r(e),m=1;m<arguments.length;m++){for(var l in o=Object(arguments[m]))a.call(o,l)&&(c[l]=o[l]);if(n){s=n(o);for(var u=0;u<s.length;u++)i.call(o,s[u])&&(c[s[u]]=o[s[u]])}}return c}},{}],12:[function(e,t,o){(function(e){function t(e,t){for(var o=0,n=e.length-1;n>=0;n--){var a=e[n];"."===a?e.splice(n,1):".."===a?(e.splice(n,1),o++):o&&(e.splice(n,1),o--)}if(t)for(;o--;o)e.unshift("..");return e}function n(e,t){if(e.filter)return e.filter(t);for(var o=[],n=0;n<e.length;n++)t(e[n],n,e)&&o.push(e[n]);return o}o.resolve=function(){for(var o="",a=!1,i=arguments.length-1;i>=-1&&!a;i--){var r=i>=0?arguments[i]:e.cwd();if("string"!=typeof r)throw new TypeError("Arguments to path.resolve must be strings");r&&(o=r+"/"+o,a="/"===r.charAt(0))}return(a?"/":"")+(o=t(n(o.split("/"),(function(e){return!!e})),!a).join("/"))||"."},o.normalize=function(e){var i=o.isAbsolute(e),r="/"===a(e,-1);return(e=t(n(e.split("/"),(function(e){return!!e})),!i).join("/"))||i||(e="."),e&&r&&(e+="/"),(i?"/":"")+e},o.isAbsolute=function(e){return"/"===e.charAt(0)},o.join=function(){var e=Array.prototype.slice.call(arguments,0);return o.normalize(n(e,(function(e,t){if("string"!=typeof e)throw new TypeError("Arguments to path.join must be strings");return e})).join("/"))},o.relative=function(e,t){function n(e){for(var t=0;t<e.length&&""===e[t];t++);for(var o=e.length-1;o>=0&&""===e[o];o--);return t>o?[]:e.slice(t,o-t+1)}e=o.resolve(e).substr(1),t=o.resolve(t).substr(1);for(var a=n(e.split("/")),i=n(t.split("/")),r=Math.min(a.length,i.length),s=r,c=0;c<r;c++)if(a[c]!==i[c]){s=c;break}var m=[];for(c=s;c<a.length;c++)m.push("..");return(m=m.concat(i.slice(s))).join("/")},o.sep="/",o.delimiter=":",o.dirname=function(e){if("string"!=typeof e&&(e+=""),0===e.length)return".";for(var t=e.charCodeAt(0),o=47===t,n=-1,a=!0,i=e.length-1;i>=1;--i)if(47===(t=e.charCodeAt(i))){if(!a){n=i;break}}else a=!1;return-1===n?o?"/":".":o&&1===n?"/":e.slice(0,n)},o.basename=function(e,t){var o=function(e){"string"!=typeof e&&(e+="");var t,o=0,n=-1,a=!0;for(t=e.length-1;t>=0;--t)if(47===e.charCodeAt(t)){if(!a){o=t+1;break}}else-1===n&&(a=!1,n=t+1);return-1===n?"":e.slice(o,n)}(e);return t&&o.substr(-1*t.length)===t&&(o=o.substr(0,o.length-t.length)),o},o.extname=function(e){"string"!=typeof e&&(e+="");for(var t=-1,o=0,n=-1,a=!0,i=0,r=e.length-1;r>=0;--r){var s=e.charCodeAt(r);if(47!==s)-1===n&&(a=!1,n=r+1),46===s?-1===t?t=r:1!==i&&(i=1):-1!==t&&(i=-1);else if(!a){o=r+1;break}}return-1===t||-1===n||0===i||1===i&&t===n-1&&t===o+1?"":e.slice(t,n)};var a="b"==="ab".substr(-1)?function(e,t,o){return e.substr(t,o)}:function(e,t,o){return t<0&&(t=e.length+t),e.substr(t,o)}}).call(this,e("_process"))},{_process:13}],13:[function(e,t,o){var n,a,i=t.exports={};function r(){throw new Error("setTimeout has not been defined")}function s(){throw new Error("clearTimeout has not been defined")}function c(e){if(n===setTimeout)return setTimeout(e,0);if((n===r||!n)&&setTimeout)return n=setTimeout,setTimeout(e,0);try{return n(e,0)}catch(t){try{return n.call(null,e,0)}catch(t){return n.call(this,e,0)}}}!function(){try{n="function"==typeof setTimeout?setTimeout:r}catch(e){n=r}try{a="function"==typeof clearTimeout?clearTimeout:s}catch(e){a=s}}();var m,l=[],u=!1,d=-1;function h(){u&&m&&(u=!1,m.length?l=m.concat(l):d=-1,l.length&&p())}function p(){if(!u){var e=c(h);u=!0;for(var t=l.length;t;){for(m=l,l=[];++d<t;)m&&m[d].run();d=-1,t=l.length}m=null,u=!1,function(e){if(a===clearTimeout)return clearTimeout(e);if((a===s||!a)&&clearTimeout)return a=clearTimeout,clearTimeout(e);try{a(e)}catch(t){try{return a.call(null,e)}catch(t){return a.call(this,e)}}}(e)}}function g(e,t){this.fun=e,this.array=t}function f(){}i.nextTick=function(e){var t=new Array(arguments.length-1);if(arguments.length>1)for(var o=1;o<arguments.length;o++)t[o-1]=arguments[o];l.push(new g(e,t)),1!==l.length||u||c(p)},g.prototype.run=function(){this.fun.apply(null,this.array)},i.title="browser",i.browser=!0,i.env={},i.argv=[],i.version="",i.versions={},i.on=f,i.addListener=f,i.once=f,i.off=f,i.removeListener=f,i.removeAllListeners=f,i.emit=f,i.prependListener=f,i.prependOnceListener=f,i.listeners=function(e){return[]},i.binding=function(e){throw new Error("process.binding is not supported")},i.cwd=function(){return"/"},i.chdir=function(e){throw new Error("process.chdir is not supported")},i.umask=function(){return 0}},{}],14:[function(e,t,o){"use strict";function n(e,t,o,n,a){}n.resetWarningCache=function(){0},t.exports=n},{"./lib/ReactPropTypesSecret":18}],15:[function(e,t,o){"use strict";var n=e("./lib/ReactPropTypesSecret");function a(){}function i(){}i.resetWarningCache=a,t.exports=function(){function e(e,t,o,a,i,r){if(r!==n){var s=new Error("Calling PropTypes validators directly is not supported by the `prop-types` package. Use PropTypes.checkPropTypes() to call them. Read more at http://fb.me/use-check-prop-types");throw s.name="Invariant Violation",s}}function t(){return e}e.isRequired=e;var o={array:e,bool:e,func:e,number:e,object:e,string:e,symbol:e,any:e,arrayOf:t,element:e,elementType:e,instanceOf:t,node:e,objectOf:t,oneOf:t,oneOfType:t,shape:t,exact:t,checkPropTypes:i,resetWarningCache:a};return o.PropTypes=o,o}},{"./lib/ReactPropTypesSecret":18}],16:[function(e,t,o){"use strict";var n=e("react-is"),a=e("object-assign"),i=e("./lib/ReactPropTypesSecret"),r=e("./checkPropTypes"),s=Function.call.bind(Object.prototype.hasOwnProperty),c=function(){};function m(){return null}t.exports=function(e,t){var o="function"==typeof Symbol&&Symbol.iterator;var l={array:p("array"),bool:p("boolean"),func:p("function"),number:p("number"),object:p("object"),string:p("string"),symbol:p("symbol"),any:h(m),arrayOf:function(e){return h((function(t,o,n,a,r){if("function"!=typeof e)return new d("Property `"+r+"` of component `"+n+"` has invalid PropType notation inside arrayOf.");var s=t[o];if(!Array.isArray(s))return new d("Invalid "+a+" `"+r+"` of type `"+f(s)+"` supplied to `"+n+"`, expected an array.");for(var c=0;c<s.length;c++){var m=e(s,c,n,a,r+"["+c+"]",i);if(m instanceof Error)return m}return null}))},element:h((function(t,o,n,a,i){var r=t[o];return e(r)?null:new d("Invalid "+a+" `"+i+"` of type `"+f(r)+"` supplied to `"+n+"`, expected a single ReactElement.")})),elementType:h((function(e,t,o,a,i){var r=e[t];return n.isValidElementType(r)?null:new d("Invalid "+a+" `"+i+"` of type `"+f(r)+"` supplied to `"+o+"`, expected a single ReactElement type.")})),instanceOf:function(e){return h((function(t,o,n,a,i){if(!(t[o]instanceof e)){var r=e.name||"<<anonymous>>";return new d("Invalid "+a+" `"+i+"` of type `"+function(e){if(!e.constructor||!e.constructor.name)return"<<anonymous>>";return e.constructor.name}(t[o])+"` supplied to `"+n+"`, expected instance of `"+r+"`.")}return null}))},node:h((function(e,t,o,n,a){return g(e[t])?null:new d("Invalid "+n+" `"+a+"` supplied to `"+o+"`, expected a ReactNode.")})),objectOf:function(e){return h((function(t,o,n,a,r){if("function"!=typeof e)return new d("Property `"+r+"` of component `"+n+"` has invalid PropType notation inside objectOf.");var c=t[o],m=f(c);if("object"!==m)return new d("Invalid "+a+" `"+r+"` of type `"+m+"` supplied to `"+n+"`, expected an object.");for(var l in c)if(s(c,l)){var u=e(c,l,n,a,r+"."+l,i);if(u instanceof Error)return u}return null}))},oneOf:function(e){if(!Array.isArray(e))return m;function t(t,o,n,a,i){for(var r=t[o],s=0;s<e.length;s++)if(u(r,e[s]))return null;var c=JSON.stringify(e,(function(e,t){return"symbol"===b(t)?String(t):t}));return new d("Invalid "+a+" `"+i+"` of value `"+String(r)+"` supplied to `"+n+"`, expected one of "+c+".")}return h(t)},oneOfType:function(e){if(!Array.isArray(e))return m;for(var t=0;t<e.length;t++){var o=e[t];if("function"!=typeof o)return c("Invalid argument supplied to oneOfType. Expected an array of check functions, but received "+v(o)+" at index "+t+"."),m}return h((function(t,o,n,a,r){for(var s=0;s<e.length;s++){if(null==(0,e[s])(t,o,n,a,r,i))return null}return new d("Invalid "+a+" `"+r+"` supplied to `"+n+"`.")}))},shape:function(e){return h((function(t,o,n,a,r){var s=t[o],c=f(s);if("object"!==c)return new d("Invalid "+a+" `"+r+"` of type `"+c+"` supplied to `"+n+"`, expected `object`.");for(var m in e){var l=e[m];if(l){var u=l(s,m,n,a,r+"."+m,i);if(u)return u}}return null}))},exact:function(e){return h((function(t,o,n,r,s){var c=t[o],m=f(c);if("object"!==m)return new d("Invalid "+r+" `"+s+"` of type `"+m+"` supplied to `"+n+"`, expected `object`.");var l=a({},t[o],e);for(var u in l){var h=e[u];if(!h)return new d("Invalid "+r+" `"+s+"` key `"+u+"` supplied to `"+n+"`.\nBad object: "+JSON.stringify(t[o],null,"  ")+"\nValid keys: "+JSON.stringify(Object.keys(e),null,"  "));var p=h(c,u,n,r,s+"."+u,i);if(p)return p}return null}))}};function u(e,t){return e===t?0!==e||1/e==1/t:e!=e&&t!=t}function d(e){this.message=e,this.stack=""}function h(e){function o(o,n,a,r,s,c,m){if((r=r||"<<anonymous>>",c=c||a,m!==i)&&t){var l=new Error("Calling PropTypes validators directly is not supported by the `prop-types` package. Use `PropTypes.checkPropTypes()` to call them. Read more at http://fb.me/use-check-prop-types");throw l.name="Invariant Violation",l}return null==n[a]?o?null===n[a]?new d("The "+s+" `"+c+"` is marked as required in `"+r+"`, but its value is `null`."):new d("The "+s+" `"+c+"` is marked as required in `"+r+"`, but its value is `undefined`."):null:e(n,a,r,s,c)}var n=o.bind(null,!1);return n.isRequired=o.bind(null,!0),n}function p(e){return h((function(t,o,n,a,i,r){var s=t[o];return f(s)!==e?new d("Invalid "+a+" `"+i+"` of type `"+b(s)+"` supplied to `"+n+"`, expected `"+e+"`."):null}))}function g(t){switch(typeof t){case"number":case"string":case"undefined":return!0;case"boolean":return!t;case"object":if(Array.isArray(t))return t.every(g);if(null===t||e(t))return!0;var n=function(e){var t=e&&(o&&e[o]||e["@@iterator"]);if("function"==typeof t)return t}(t);if(!n)return!1;var a,i=n.call(t);if(n!==t.entries){for(;!(a=i.next()).done;)if(!g(a.value))return!1}else for(;!(a=i.next()).done;){var r=a.value;if(r&&!g(r[1]))return!1}return!0;default:return!1}}function f(e){var t=typeof e;return Array.isArray(e)?"array":e instanceof RegExp?"object":function(e,t){return"symbol"===e||!!t&&("Symbol"===t["@@toStringTag"]||"function"==typeof Symbol&&t instanceof Symbol)}(t,e)?"symbol":t}function b(e){if(null==e)return""+e;var t=f(e);if("object"===t){if(e instanceof Date)return"date";if(e instanceof RegExp)return"regexp"}return t}function v(e){var t=b(e);switch(t){case"array":case"object":return"an "+t;case"boolean":case"date":case"regexp":return"a "+t;default:return t}}return d.prototype=Error.prototype,l.checkPropTypes=r,l.resetWarningCache=r.resetWarningCache,l.PropTypes=l,l}},{"./checkPropTypes":14,"./lib/ReactPropTypesSecret":18,"object-assign":11,"react-is":25}],17:[function(e,t,o){t.exports=e("./factoryWithThrowingShims")()},{"./factoryWithThrowingShims":15,"./factoryWithTypeCheckers":16,"react-is":25}],18:[function(e,t,o){"use strict";t.exports="SECRET_DO_NOT_PASS_THIS_OR_YOU_WILL_BE_FIRED"},{}],19:[function(e,t,o){(function(e,n){
/*!
 *
 * Copyright 2009-2017 Kris Kowal under the terms of the MIT
 * license found at https://github.com/kriskowal/q/blob/v1/LICENSE
 *
 * With parts by Tyler Close
 * Copyright 2007-2009 Tyler Close under the terms of the MIT X license found
 * at http://www.opensource.org/licenses/mit-license.html
 * Forked at ref_send.js version: 2009-05-11
 *
 * With parts by Mark Miller
 * Copyright (C) 2011 Google Inc.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 *
 */
!function(e){"use strict";if("function"==typeof bootstrap)bootstrap("promise",e);else if("object"==typeof o&&"object"==typeof t)t.exports=e();else if("function"==typeof define&&define.amd)define(e);else if("undefined"!=typeof ses){if(!ses.ok())return;ses.makeQ=e}else{if("undefined"==typeof window&&"undefined"==typeof self)throw new Error("This environment was not anticipated by Q. Please file a bug.");var n="undefined"!=typeof window?window:self,a=n.Q;n.Q=e(),n.Q.noConflict=function(){return n.Q=a,this}}}((function(){"use strict";var t=!1;try{throw new Error}catch(e){t=!!e.stack}var o,a=A(),i=function(){},r=function(){var t={task:void 0,next:null},o=t,a=!1,i=void 0,s=!1,c=[];function m(){for(var e,o;t.next;)e=(t=t.next).task,t.task=void 0,(o=t.domain)&&(t.domain=void 0,o.enter()),l(e,o);for(;c.length;)l(e=c.pop());a=!1}function l(e,t){try{e()}catch(e){if(s)throw t&&t.exit(),setTimeout(m,0),t&&t.enter(),e;setTimeout((function(){throw e}),0)}t&&t.exit()}if(r=function(t){o=o.next={task:t,domain:s&&e.domain,next:null},a||(a=!0,i())},"object"==typeof e&&"[object process]"===e.toString()&&e.nextTick)s=!0,i=function(){e.nextTick(m)};else if("function"==typeof n)i="undefined"!=typeof window?n.bind(window,m):function(){n(m)};else if("undefined"!=typeof MessageChannel){var u=new MessageChannel;u.port1.onmessage=function(){i=d,u.port1.onmessage=m,m()};var d=function(){u.port2.postMessage(0)};i=function(){setTimeout(m,0),d()}}else i=function(){setTimeout(m,0)};return r.runAfter=function(e){c.push(e),a||(a=!0,i())},r}(),s=Function.call;function c(e){return function(){return s.apply(e,arguments)}}var m,l=c(Array.prototype.slice),u=c(Array.prototype.reduce||function(e,t){var o=0,n=this.length;if(1===arguments.length)for(;;){if(o in this){t=this[o++];break}if(++o>=n)throw new TypeError}for(;o<n;o++)o in this&&(t=e(t,this[o],o));return t}),d=c(Array.prototype.indexOf||function(e){for(var t=0;t<this.length;t++)if(this[t]===e)return t;return-1}),h=c(Array.prototype.map||function(e,t){var o=this,n=[];return u(o,(function(a,i,r){n.push(e.call(t,i,r,o))}),void 0),n}),p=Object.create||function(e){function t(){}return t.prototype=e,new t},g=Object.defineProperty||function(e,t,o){return e[t]=o.value,e},f=c(Object.prototype.hasOwnProperty),b=Object.keys||function(e){var t=[];for(var o in e)f(e,o)&&t.push(o);return t},v=c(Object.prototype.toString);function w(e){return"[object StopIteration]"===v(e)||e instanceof m}m="undefined"!=typeof ReturnValue?ReturnValue:function(e){this.value=e};function y(e,o){if(t&&o.stack&&"object"==typeof e&&null!==e&&e.stack){for(var n=[],a=o;a;a=a.source)a.stack&&(!e.__minimumStackCounter__||e.__minimumStackCounter__>a.stackCounter)&&(g(e,"__minimumStackCounter__",{value:a.stackCounter,configurable:!0}),n.unshift(a.stack));n.unshift(e.stack);var i=function(e){for(var t=e.split("\n"),o=[],n=0;n<t.length;++n){var a=t[n];!C(a)&&(-1===(i=a).indexOf("(module.js:")&&-1===i.indexOf("(node.js:"))&&a&&o.push(a)}var i;return o.join("\n")}(n.join("\nFrom previous event:\n"));g(e,"stack",{value:i,configurable:!0})}}function k(e){var t=/at .+ \((.+):(\d+):(?:\d+)\)$/.exec(e);if(t)return[t[1],Number(t[2])];var o=/at ([^ ]+):(\d+):(?:\d+)$/.exec(e);if(o)return[o[1],Number(o[2])];var n=/.*@(.+):(\d+)$/.exec(e);return n?[n[1],Number(n[2])]:void 0}function C(e){var t=k(e);if(!t)return!1;var n=t[0],i=t[1];return n===o&&i>=a&&i<=K}function A(){if(t)try{throw new Error}catch(t){var e=t.stack.split("\n"),n=k(e[0].indexOf("@")>0?e[1]:e[2]);if(!n)return;return o=n[0],n[1]}}function x(e){return e instanceof T?e:V(e)?function(e){var t=_();return x.nextTick((function(){try{e.then(t.resolve,t.reject,t.notify)}catch(e){t.reject(e)}})),t.promise}(e):O(e)}x.resolve=x,x.nextTick=r,x.longStackSupport=!1;var M=1;function _(){var e,o=[],n=[],a=p(_.prototype),i=p(T.prototype);if(i.promiseDispatch=function(t,a,i){var r=l(arguments);o?(o.push(r),"when"===a&&i[1]&&n.push(i[1])):x.nextTick((function(){e.promiseDispatch.apply(e,r)}))},i.valueOf=function(){if(o)return i;var t=S(e);return z(t)&&(e=t),t},i.inspect=function(){return e?e.inspect():{state:"pending"}},x.longStackSupport&&t)try{throw new Error}catch(e){i.stack=e.stack.substring(e.stack.indexOf("\n")+1),i.stackCounter=M++}function r(a){e=a,x.longStackSupport&&t&&(i.source=a),u(o,(function(e,t){x.nextTick((function(){a.promiseDispatch.apply(a,t)}))}),void 0),o=void 0,n=void 0}return a.promise=i,a.resolve=function(t){e||r(x(t))},a.fulfill=function(t){e||r(O(t))},a.reject=function(t){e||r(P(t))},a.notify=function(t){e||u(n,(function(e,o){x.nextTick((function(){o(t)}))}),void 0)},a}function D(e){if("function"!=typeof e)throw new TypeError("resolver must be a function.");var t=_();try{e(t.resolve,t.reject,t.notify)}catch(e){t.reject(e)}return t.promise}function E(e){return D((function(t,o){for(var n=0,a=e.length;n<a;n++)x(e[n]).then(t,o)}))}function T(e,t,o){void 0===t&&(t=function(e){return P(new Error("Promise does not support operation: "+e))}),void 0===o&&(o=function(){return{state:"unknown"}});var n=p(T.prototype);if(n.promiseDispatch=function(o,a,i){var r;try{r=e[a]?e[a].apply(n,i):t.call(n,a,i)}catch(e){r=P(e)}o&&o(r)},n.inspect=o,o){var a=o();"rejected"===a.state&&(n.exception=a.reason),n.valueOf=function(){var e=o();return"pending"===e.state||"rejected"===e.state?n:e.value}}return n}function q(e,t,o,n){return x(e).then(t,o,n)}function S(e){if(z(e)){var t=e.inspect();if("fulfilled"===t.state)return t.value}return e}function z(e){return e instanceof T}function V(e){return(t=e)===Object(t)&&"function"==typeof e.then;var t}"object"==typeof e&&e&&e.env&&e.env.Q_DEBUG&&(x.longStackSupport=!0),x.defer=_,_.prototype.makeNodeResolver=function(){var e=this;return function(t,o){t?e.reject(t):arguments.length>2?e.resolve(l(arguments,1)):e.resolve(o)}},x.Promise=D,x.promise=D,D.race=E,D.all=W,D.reject=P,D.resolve=x,x.passByCopy=function(e){return e},T.prototype.passByCopy=function(){return this},x.join=function(e,t){return x(e).join(t)},T.prototype.join=function(e){return x([this,e]).spread((function(e,t){if(e===t)return e;throw new Error("Q can't join: not the same: "+e+" "+t)}))},x.race=E,T.prototype.race=function(){return this.then(x.race)},x.makePromise=T,T.prototype.toString=function(){return"[object Promise]"},T.prototype.then=function(e,t,o){var n=this,a=_(),i=!1;return x.nextTick((function(){n.promiseDispatch((function(t){i||(i=!0,a.resolve(function(t){try{return"function"==typeof e?e(t):t}catch(e){return P(e)}}(t)))}),"when",[function(e){i||(i=!0,a.resolve(function(e){if("function"==typeof t){y(e,n);try{return t(e)}catch(e){return P(e)}}return P(e)}(e)))}])})),n.promiseDispatch(void 0,"when",[void 0,function(e){var t,n=!1;try{t=function(e){return"function"==typeof o?o(e):e}(e)}catch(e){if(n=!0,!x.onerror)throw e;x.onerror(e)}n||a.notify(t)}]),a.promise},x.tap=function(e,t){return x(e).tap(t)},T.prototype.tap=function(e){return e=x(e),this.then((function(t){return e.fcall(t).thenResolve(t)}))},x.when=q,T.prototype.thenResolve=function(e){return this.then((function(){return e}))},x.thenResolve=function(e,t){return x(e).thenResolve(t)},T.prototype.thenReject=function(e){return this.then((function(){throw e}))},x.thenReject=function(e,t){return x(e).thenReject(t)},x.nearer=S,x.isPromise=z,x.isPromiseAlike=V,x.isPending=function(e){return z(e)&&"pending"===e.inspect().state},T.prototype.isPending=function(){return"pending"===this.inspect().state},x.isFulfilled=function(e){return!z(e)||"fulfilled"===e.inspect().state},T.prototype.isFulfilled=function(){return"fulfilled"===this.inspect().state},x.isRejected=function(e){return z(e)&&"rejected"===e.inspect().state},T.prototype.isRejected=function(){return"rejected"===this.inspect().state};var B,R,G,j=[],F=[],H=[],N=!0;function I(){j.length=0,F.length=0,N||(N=!0)}function P(t){var o=T({when:function(o){return o&&function(t){if(N){var o=d(F,t);-1!==o&&("object"==typeof e&&"function"==typeof e.emit&&x.nextTick.runAfter((function(){var n=d(H,t);-1!==n&&(e.emit("rejectionHandled",j[o],t),H.splice(n,1))})),F.splice(o,1),j.splice(o,1))}}(this),o?o(t):this}},(function(){return this}),(function(){return{state:"rejected",reason:t}}));return function(t,o){N&&("object"==typeof e&&"function"==typeof e.emit&&x.nextTick.runAfter((function(){-1!==d(F,t)&&(e.emit("unhandledRejection",o,t),H.push(t))})),F.push(t),o&&void 0!==o.stack?j.push(o.stack):j.push("(no stack) "+o))}(o,t),o}function O(e){return T({when:function(){return e},get:function(t){return e[t]},set:function(t,o){e[t]=o},delete:function(t){delete e[t]},post:function(t,o){return null==t?e.apply(void 0,o):e[t].apply(e,o)},apply:function(t,o){return e.apply(t,o)},keys:function(){return b(e)}},void 0,(function(){return{state:"fulfilled",value:e}}))}function L(e,t,o){return x(e).spread(t,o)}function U(e,t,o){return x(e).dispatch(t,o)}function W(e){return q(e,(function(e){var t=0,o=_();return u(e,(function(n,a,i){var r;z(a)&&"fulfilled"===(r=a.inspect()).state?e[i]=r.value:(++t,q(a,(function(n){e[i]=n,0==--t&&o.resolve(e)}),o.reject,(function(e){o.notify({index:i,value:e})})))}),void 0),0===t&&o.resolve(e),o.promise}))}function $(e){if(0===e.length)return x.resolve();var t=x.defer(),o=0;return u(e,(function(n,a,i){var r=e[i];o++,q(r,(function(e){t.resolve(e)}),(function(e){if(0===--o){var n=e||new Error(""+e);n.message="Q can't get fulfillment value from any promise, all promises were rejected. Last error message: "+n.message,t.reject(n)}}),(function(e){t.notify({index:i,value:e})}))}),void 0),t.promise}function Q(e){return q(e,(function(e){return e=h(e,x),q(W(h(e,(function(e){return q(e,i,i)}))),(function(){return e}))}))}x.resetUnhandledRejections=I,x.getUnhandledReasons=function(){return j.slice()},x.stopUnhandledRejectionTracking=function(){I(),N=!1},I(),x.reject=P,x.fulfill=O,x.master=function(e){return T({isDef:function(){}},(function(t,o){return U(e,t,o)}),(function(){return x(e).inspect()}))},x.spread=L,T.prototype.spread=function(e,t){return this.all().then((function(t){return e.apply(void 0,t)}),t)},x.async=function(e){return function(){function t(e,t){var i;if("undefined"==typeof StopIteration){try{i=o[e](t)}catch(e){return P(e)}return i.done?x(i.value):q(i.value,n,a)}try{i=o[e](t)}catch(e){return w(e)?x(e.value):P(e)}return q(i,n,a)}var o=e.apply(this,arguments),n=t.bind(t,"next"),a=t.bind(t,"throw");return n()}},x.spawn=function(e){x.done(x.async(e)())},x.return=function(e){throw new m(e)},x.promised=function(e){return function(){return L([this,W(arguments)],(function(t,o){return e.apply(t,o)}))}},x.dispatch=U,T.prototype.dispatch=function(e,t){var o=this,n=_();return x.nextTick((function(){o.promiseDispatch(n.resolve,e,t)})),n.promise},x.get=function(e,t){return x(e).dispatch("get",[t])},T.prototype.get=function(e){return this.dispatch("get",[e])},x.set=function(e,t,o){return x(e).dispatch("set",[t,o])},T.prototype.set=function(e,t){return this.dispatch("set",[e,t])},x.del=x.delete=function(e,t){return x(e).dispatch("delete",[t])},T.prototype.del=T.prototype.delete=function(e){return this.dispatch("delete",[e])},x.mapply=x.post=function(e,t,o){return x(e).dispatch("post",[t,o])},T.prototype.mapply=T.prototype.post=function(e,t){return this.dispatch("post",[e,t])},x.send=x.mcall=x.invoke=function(e,t){return x(e).dispatch("post",[t,l(arguments,2)])},T.prototype.send=T.prototype.mcall=T.prototype.invoke=function(e){return this.dispatch("post",[e,l(arguments,1)])},x.fapply=function(e,t){return x(e).dispatch("apply",[void 0,t])},T.prototype.fapply=function(e){return this.dispatch("apply",[void 0,e])},x.try=x.fcall=function(e){return x(e).dispatch("apply",[void 0,l(arguments,1)])},T.prototype.fcall=function(){return this.dispatch("apply",[void 0,l(arguments)])},x.fbind=function(e){var t=x(e),o=l(arguments,1);return function(){return t.dispatch("apply",[this,o.concat(l(arguments))])}},T.prototype.fbind=function(){var e=this,t=l(arguments);return function(){return e.dispatch("apply",[this,t.concat(l(arguments))])}},x.keys=function(e){return x(e).dispatch("keys",[])},T.prototype.keys=function(){return this.dispatch("keys",[])},x.all=W,T.prototype.all=function(){return W(this)},x.any=$,T.prototype.any=function(){return $(this)},x.allResolved=(B=Q,R="allResolved",G="allSettled",function(){return"undefined"!=typeof console&&"function"==typeof console.warn&&console.warn(R+" is deprecated, use "+G+" instead.",new Error("").stack),B.apply(B,arguments)}),T.prototype.allResolved=function(){return Q(this)},x.allSettled=function(e){return x(e).allSettled()},T.prototype.allSettled=function(){return this.then((function(e){return W(h(e,(function(e){function t(){return e.inspect()}return(e=x(e)).then(t,t)})))}))},x.fail=x.catch=function(e,t){return x(e).then(void 0,t)},T.prototype.fail=T.prototype.catch=function(e){return this.then(void 0,e)},x.progress=function(e,t){return x(e).then(void 0,void 0,t)},T.prototype.progress=function(e){return this.then(void 0,void 0,e)},x.fin=x.finally=function(e,t){return x(e).finally(t)},T.prototype.fin=T.prototype.finally=function(e){if(!e||"function"!=typeof e.apply)throw new Error("Q can't apply finally callback");return e=x(e),this.then((function(t){return e.fcall().then((function(){return t}))}),(function(t){return e.fcall().then((function(){throw t}))}))},x.done=function(e,t,o,n){return x(e).done(t,o,n)},T.prototype.done=function(t,o,n){var a=function(e){x.nextTick((function(){if(y(e,i),!x.onerror)throw e;x.onerror(e)}))},i=t||o||n?this.then(t,o,n):this;"object"==typeof e&&e&&e.domain&&(a=e.domain.bind(a)),i.then(void 0,a)},x.timeout=function(e,t,o){return x(e).timeout(t,o)},T.prototype.timeout=function(e,t){var o=_(),n=setTimeout((function(){t&&"string"!=typeof t||((t=new Error(t||"Timed out after "+e+" ms")).code="ETIMEDOUT"),o.reject(t)}),e);return this.then((function(e){clearTimeout(n),o.resolve(e)}),(function(e){clearTimeout(n),o.reject(e)}),o.notify),o.promise},x.delay=function(e,t){return void 0===t&&(t=e,e=void 0),x(e).delay(t)},T.prototype.delay=function(e){return this.then((function(t){var o=_();return setTimeout((function(){o.resolve(t)}),e),o.promise}))},x.nfapply=function(e,t){return x(e).nfapply(t)},T.prototype.nfapply=function(e){var t=_(),o=l(e);return o.push(t.makeNodeResolver()),this.fapply(o).fail(t.reject),t.promise},x.nfcall=function(e){var t=l(arguments,1);return x(e).nfapply(t)},T.prototype.nfcall=function(){var e=l(arguments),t=_();return e.push(t.makeNodeResolver()),this.fapply(e).fail(t.reject),t.promise},x.nfbind=x.denodeify=function(e){if(void 0===e)throw new Error("Q can't wrap an undefined function");var t=l(arguments,1);return function(){var o=t.concat(l(arguments)),n=_();return o.push(n.makeNodeResolver()),x(e).fapply(o).fail(n.reject),n.promise}},T.prototype.nfbind=T.prototype.denodeify=function(){var e=l(arguments);return e.unshift(this),x.denodeify.apply(void 0,e)},x.nbind=function(e,t){var o=l(arguments,2);return function(){var n=o.concat(l(arguments)),a=_();function i(){return e.apply(t,arguments)}return n.push(a.makeNodeResolver()),x(i).fapply(n).fail(a.reject),a.promise}},T.prototype.nbind=function(){var e=l(arguments,0);return e.unshift(this),x.nbind.apply(void 0,e)},x.nmapply=x.npost=function(e,t,o){return x(e).npost(t,o)},T.prototype.nmapply=T.prototype.npost=function(e,t){var o=l(t||[]),n=_();return o.push(n.makeNodeResolver()),this.dispatch("post",[e,o]).fail(n.reject),n.promise},x.nsend=x.nmcall=x.ninvoke=function(e,t){var o=l(arguments,2),n=_();return o.push(n.makeNodeResolver()),x(e).dispatch("post",[t,o]).fail(n.reject),n.promise},T.prototype.nsend=T.prototype.nmcall=T.prototype.ninvoke=function(e){var t=l(arguments,1),o=_();return t.push(o.makeNodeResolver()),this.dispatch("post",[e,t]).fail(o.reject),o.promise},x.nodeify=function(e,t){return x(e).nodeify(t)},T.prototype.nodeify=function(e){if(!e)return this;this.then((function(t){x.nextTick((function(){e(null,t)}))}),(function(t){x.nextTick((function(){e(t)}))}))},x.noConflict=function(){throw new Error("Q.noConflict only works when Q is used as a global")};var K=A();return x}))}).call(this,e("_process"),e("timers").setImmediate)},{_process:13,timers:35}],20:[function(e,t,o){
/** @license React v16.13.0
 * react-dom.development.js
 *
 * Copyright (c) Facebook, Inc. and its affiliates.
 *
 * This source code is licensed under the MIT license found in the
 * LICENSE file in the root directory of this source tree.
 */
"use strict"},{"object-assign":11,"prop-types/checkPropTypes":14,react:28,scheduler:33,"scheduler/tracing":34}],21:[function(e,t,o){
/** @license React v16.13.0
 * react-dom.production.min.js
 *
 * Copyright (c) Facebook, Inc. and its affiliates.
 *
 * This source code is licensed under the MIT license found in the
 * LICENSE file in the root directory of this source tree.
 */
"use strict";var n=e("react"),a=e("object-assign"),i=e("scheduler");function r(e){for(var t="https://reactjs.org/docs/error-decoder.html?invariant="+e,o=1;o<arguments.length;o++)t+="&args[]="+encodeURIComponent(arguments[o]);return"Minified React error #"+e+"; visit "+t+" for the full message or use the non-minified dev environment for full errors and additional helpful warnings."}if(!n)throw Error(r(227));function s(e,t,o,n,a,i,r,s,c){var m=Array.prototype.slice.call(arguments,3);try{t.apply(o,m)}catch(e){this.onError(e)}}var c=!1,m=null,l=!1,u=null,d={onError:function(e){c=!0,m=e}};function h(e,t,o,n,a,i,r,l,u){c=!1,m=null,s.apply(d,arguments)}var p=null,g=null,f=null;function b(e,t,o){var n=e.type||"unknown-event";e.currentTarget=f(o),function(e,t,o,n,a,i,s,d,p){if(h.apply(this,arguments),c){if(!c)throw Error(r(198));var g=m;c=!1,m=null,l||(l=!0,u=g)}}(n,t,void 0,e),e.currentTarget=null}var v=n.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED;v.hasOwnProperty("ReactCurrentDispatcher")||(v.ReactCurrentDispatcher={current:null}),v.hasOwnProperty("ReactCurrentBatchConfig")||(v.ReactCurrentBatchConfig={suspense:null});var w=/^(.*)[\\\/]/,y="function"==typeof Symbol&&Symbol.for,k=y?Symbol.for("react.element"):60103,C=y?Symbol.for("react.portal"):60106,A=y?Symbol.for("react.fragment"):60107,x=y?Symbol.for("react.strict_mode"):60108,M=y?Symbol.for("react.profiler"):60114,_=y?Symbol.for("react.provider"):60109,D=y?Symbol.for("react.context"):60110,E=y?Symbol.for("react.concurrent_mode"):60111,T=y?Symbol.for("react.forward_ref"):60112,q=y?Symbol.for("react.suspense"):60113,S=y?Symbol.for("react.suspense_list"):60120,z=y?Symbol.for("react.memo"):60115,V=y?Symbol.for("react.lazy"):60116,B=y?Symbol.for("react.block"):60121,R="function"==typeof Symbol&&Symbol.iterator;function G(e){return null===e||"object"!=typeof e?null:"function"==typeof(e=R&&e[R]||e["@@iterator"])?e:null}function j(e){if(null==e)return null;if("function"==typeof e)return e.displayName||e.name||null;if("string"==typeof e)return e;switch(e){case A:return"Fragment";case C:return"Portal";case M:return"Profiler";case x:return"StrictMode";case q:return"Suspense";case S:return"SuspenseList"}if("object"==typeof e)switch(e.$$typeof){case D:return"Context.Consumer";case _:return"Context.Provider";case T:var t=e.render;return t=t.displayName||t.name||"",e.displayName||(""!==t?"ForwardRef("+t+")":"ForwardRef");case z:return j(e.type);case B:return j(e.render);case V:if(e=1===e._status?e._result:null)return j(e)}return null}function F(e){var t="";do{e:switch(e.tag){case 3:case 4:case 6:case 7:case 10:case 9:var o="";break e;default:var n=e._debugOwner,a=e._debugSource,i=j(e.type);o=null,n&&(o=j(n.type)),n=i,i="",a?i=" (at "+a.fileName.replace(w,"")+":"+a.lineNumber+")":o&&(i=" (created by "+o+")"),o="\n    in "+(n||"Unknown")+i}t+=o,e=e.return}while(e);return t}var H=null,N={};function I(){if(H)for(var e in N){var t=N[e],o=H.indexOf(e);if(!(-1<o))throw Error(r(96,e));if(!O[o]){if(!t.extractEvents)throw Error(r(97,e));for(var n in O[o]=t,o=t.eventTypes){var a=void 0,i=o[n],s=t,c=n;if(L.hasOwnProperty(c))throw Error(r(99,c));L[c]=i;var m=i.phasedRegistrationNames;if(m){for(a in m)m.hasOwnProperty(a)&&P(m[a],s,c);a=!0}else i.registrationName?(P(i.registrationName,s,c),a=!0):a=!1;if(!a)throw Error(r(98,n,e))}}}}function P(e,t,o){if(U[e])throw Error(r(100,e));U[e]=t,W[e]=t.eventTypes[o].dependencies}var O=[],L={},U={},W={};function $(e){var t,o=!1;for(t in e)if(e.hasOwnProperty(t)){var n=e[t];if(!N.hasOwnProperty(t)||N[t]!==n){if(N[t])throw Error(r(102,t));N[t]=n,o=!0}}o&&I()}var Q=!("undefined"==typeof window||void 0===window.document||void 0===window.document.createElement),K=null,J=null,Y=null;function Z(e){if(e=g(e)){if("function"!=typeof K)throw Error(r(280));var t=e.stateNode;t&&(t=p(t),K(e.stateNode,e.type,t))}}function X(e){J?Y?Y.push(e):Y=[e]:J=e}function ee(){if(J){var e=J,t=Y;if(Y=J=null,Z(e),t)for(e=0;e<t.length;e++)Z(t[e])}}function te(e,t){return e(t)}function oe(e,t,o,n,a){return e(t,o,n,a)}function ne(){}var ae=te,ie=!1,re=!1;function se(){null===J&&null===Y||(ne(),ee())}function ce(e,t,o){if(re)return e(t,o);re=!0;try{return ae(e,t,o)}finally{re=!1,se()}}var me=/^[:A-Z_a-z\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u02FF\u0370-\u037D\u037F-\u1FFF\u200C-\u200D\u2070-\u218F\u2C00-\u2FEF\u3001-\uD7FF\uF900-\uFDCF\uFDF0-\uFFFD][:A-Z_a-z\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u02FF\u0370-\u037D\u037F-\u1FFF\u200C-\u200D\u2070-\u218F\u2C00-\u2FEF\u3001-\uD7FF\uF900-\uFDCF\uFDF0-\uFFFD\-.0-9\u00B7\u0300-\u036F\u203F-\u2040]*$/,le=Object.prototype.hasOwnProperty,ue={},de={};function he(e,t,o,n,a,i){this.acceptsBooleans=2===t||3===t||4===t,this.attributeName=n,this.attributeNamespace=a,this.mustUseProperty=o,this.propertyName=e,this.type=t,this.sanitizeURL=i}var pe={};"children dangerouslySetInnerHTML defaultValue defaultChecked innerHTML suppressContentEditableWarning suppressHydrationWarning style".split(" ").forEach((function(e){pe[e]=new he(e,0,!1,e,null,!1)})),[["acceptCharset","accept-charset"],["className","class"],["htmlFor","for"],["httpEquiv","http-equiv"]].forEach((function(e){var t=e[0];pe[t]=new he(t,1,!1,e[1],null,!1)})),["contentEditable","draggable","spellCheck","value"].forEach((function(e){pe[e]=new he(e,2,!1,e.toLowerCase(),null,!1)})),["autoReverse","externalResourcesRequired","focusable","preserveAlpha"].forEach((function(e){pe[e]=new he(e,2,!1,e,null,!1)})),"allowFullScreen async autoFocus autoPlay controls default defer disabled disablePictureInPicture formNoValidate hidden loop noModule noValidate open playsInline readOnly required reversed scoped seamless itemScope".split(" ").forEach((function(e){pe[e]=new he(e,3,!1,e.toLowerCase(),null,!1)})),["checked","multiple","muted","selected"].forEach((function(e){pe[e]=new he(e,3,!0,e,null,!1)})),["capture","download"].forEach((function(e){pe[e]=new he(e,4,!1,e,null,!1)})),["cols","rows","size","span"].forEach((function(e){pe[e]=new he(e,6,!1,e,null,!1)})),["rowSpan","start"].forEach((function(e){pe[e]=new he(e,5,!1,e.toLowerCase(),null,!1)}));var ge=/[\-:]([a-z])/g;function fe(e){return e[1].toUpperCase()}function be(e,t,o,n){var a=pe.hasOwnProperty(t)?pe[t]:null;(null!==a?0===a.type:!n&&(2<t.length&&("o"===t[0]||"O"===t[0])&&("n"===t[1]||"N"===t[1])))||(function(e,t,o,n){if(null==t||function(e,t,o,n){if(null!==o&&0===o.type)return!1;switch(typeof t){case"function":case"symbol":return!0;case"boolean":return!n&&(null!==o?!o.acceptsBooleans:"data-"!==(e=e.toLowerCase().slice(0,5))&&"aria-"!==e);default:return!1}}(e,t,o,n))return!0;if(n)return!1;if(null!==o)switch(o.type){case 3:return!t;case 4:return!1===t;case 5:return isNaN(t);case 6:return isNaN(t)||1>t}return!1}(t,o,a,n)&&(o=null),n||null===a?function(e){return!!le.call(de,e)||!le.call(ue,e)&&(me.test(e)?de[e]=!0:(ue[e]=!0,!1))}(t)&&(null===o?e.removeAttribute(t):e.setAttribute(t,""+o)):a.mustUseProperty?e[a.propertyName]=null===o?3!==a.type&&"":o:(t=a.attributeName,n=a.attributeNamespace,null===o?e.removeAttribute(t):(o=3===(a=a.type)||4===a&&!0===o?"":""+o,n?e.setAttributeNS(n,t,o):e.setAttribute(t,o))))}function ve(e){switch(typeof e){case"boolean":case"number":case"object":case"string":case"undefined":return e;default:return""}}function we(e){var t=e.type;return(e=e.nodeName)&&"input"===e.toLowerCase()&&("checkbox"===t||"radio"===t)}function ye(e){e._valueTracker||(e._valueTracker=function(e){var t=we(e)?"checked":"value",o=Object.getOwnPropertyDescriptor(e.constructor.prototype,t),n=""+e[t];if(!e.hasOwnProperty(t)&&void 0!==o&&"function"==typeof o.get&&"function"==typeof o.set){var a=o.get,i=o.set;return Object.defineProperty(e,t,{configurable:!0,get:function(){return a.call(this)},set:function(e){n=""+e,i.call(this,e)}}),Object.defineProperty(e,t,{enumerable:o.enumerable}),{getValue:function(){return n},setValue:function(e){n=""+e},stopTracking:function(){e._valueTracker=null,delete e[t]}}}}(e))}function ke(e){if(!e)return!1;var t=e._valueTracker;if(!t)return!0;var o=t.getValue(),n="";return e&&(n=we(e)?e.checked?"true":"false":e.value),(e=n)!==o&&(t.setValue(e),!0)}function Ce(e,t){var o=t.checked;return a({},t,{defaultChecked:void 0,defaultValue:void 0,value:void 0,checked:null!=o?o:e._wrapperState.initialChecked})}function Ae(e,t){var o=null==t.defaultValue?"":t.defaultValue,n=null!=t.checked?t.checked:t.defaultChecked;o=ve(null!=t.value?t.value:o),e._wrapperState={initialChecked:n,initialValue:o,controlled:"checkbox"===t.type||"radio"===t.type?null!=t.checked:null!=t.value}}function xe(e,t){null!=(t=t.checked)&&be(e,"checked",t,!1)}function Me(e,t){xe(e,t);var o=ve(t.value),n=t.type;if(null!=o)"number"===n?(0===o&&""===e.value||e.value!=o)&&(e.value=""+o):e.value!==""+o&&(e.value=""+o);else if("submit"===n||"reset"===n)return void e.removeAttribute("value");t.hasOwnProperty("value")?De(e,t.type,o):t.hasOwnProperty("defaultValue")&&De(e,t.type,ve(t.defaultValue)),null==t.checked&&null!=t.defaultChecked&&(e.defaultChecked=!!t.defaultChecked)}function _e(e,t,o){if(t.hasOwnProperty("value")||t.hasOwnProperty("defaultValue")){var n=t.type;if(!("submit"!==n&&"reset"!==n||void 0!==t.value&&null!==t.value))return;t=""+e._wrapperState.initialValue,o||t===e.value||(e.value=t),e.defaultValue=t}""!==(o=e.name)&&(e.name=""),e.defaultChecked=!!e._wrapperState.initialChecked,""!==o&&(e.name=o)}function De(e,t,o){"number"===t&&e.ownerDocument.activeElement===e||(null==o?e.defaultValue=""+e._wrapperState.initialValue:e.defaultValue!==""+o&&(e.defaultValue=""+o))}function Ee(e,t){return e=a({children:void 0},t),(t=function(e){var t="";return n.Children.forEach(e,(function(e){null!=e&&(t+=e)})),t}(t.children))&&(e.children=t),e}function Te(e,t,o,n){if(e=e.options,t){t={};for(var a=0;a<o.length;a++)t["$"+o[a]]=!0;for(o=0;o<e.length;o++)a=t.hasOwnProperty("$"+e[o].value),e[o].selected!==a&&(e[o].selected=a),a&&n&&(e[o].defaultSelected=!0)}else{for(o=""+ve(o),t=null,a=0;a<e.length;a++){if(e[a].value===o)return e[a].selected=!0,void(n&&(e[a].defaultSelected=!0));null!==t||e[a].disabled||(t=e[a])}null!==t&&(t.selected=!0)}}function qe(e,t){if(null!=t.dangerouslySetInnerHTML)throw Error(r(91));return a({},t,{value:void 0,defaultValue:void 0,children:""+e._wrapperState.initialValue})}function Se(e,t){var o=t.value;if(null==o){if(o=t.children,t=t.defaultValue,null!=o){if(null!=t)throw Error(r(92));if(Array.isArray(o)){if(!(1>=o.length))throw Error(r(93));o=o[0]}t=o}null==t&&(t=""),o=t}e._wrapperState={initialValue:ve(o)}}function ze(e,t){var o=ve(t.value),n=ve(t.defaultValue);null!=o&&((o=""+o)!==e.value&&(e.value=o),null==t.defaultValue&&e.defaultValue!==o&&(e.defaultValue=o)),null!=n&&(e.defaultValue=""+n)}function Ve(e){var t=e.textContent;t===e._wrapperState.initialValue&&""!==t&&null!==t&&(e.value=t)}"accent-height alignment-baseline arabic-form baseline-shift cap-height clip-path clip-rule color-interpolation color-interpolation-filters color-profile color-rendering dominant-baseline enable-background fill-opacity fill-rule flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-name glyph-orientation-horizontal glyph-orientation-vertical horiz-adv-x horiz-origin-x image-rendering letter-spacing lighting-color marker-end marker-mid marker-start overline-position overline-thickness paint-order panose-1 pointer-events rendering-intent shape-rendering stop-color stop-opacity strikethrough-position strikethrough-thickness stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width text-anchor text-decoration text-rendering underline-position underline-thickness unicode-bidi unicode-range units-per-em v-alphabetic v-hanging v-ideographic v-mathematical vector-effect vert-adv-y vert-origin-x vert-origin-y word-spacing writing-mode xmlns:xlink x-height".split(" ").forEach((function(e){var t=e.replace(ge,fe);pe[t]=new he(t,1,!1,e,null,!1)})),"xlink:actuate xlink:arcrole xlink:role xlink:show xlink:title xlink:type".split(" ").forEach((function(e){var t=e.replace(ge,fe);pe[t]=new he(t,1,!1,e,"http://www.w3.org/1999/xlink",!1)})),["xml:base","xml:lang","xml:space"].forEach((function(e){var t=e.replace(ge,fe);pe[t]=new he(t,1,!1,e,"http://www.w3.org/XML/1998/namespace",!1)})),["tabIndex","crossOrigin"].forEach((function(e){pe[e]=new he(e,1,!1,e.toLowerCase(),null,!1)})),pe.xlinkHref=new he("xlinkHref",1,!1,"xlink:href","http://www.w3.org/1999/xlink",!0),["src","href","action","formAction"].forEach((function(e){pe[e]=new he(e,1,!1,e.toLowerCase(),null,!0)}));var Be="http://www.w3.org/1999/xhtml",Re="http://www.w3.org/2000/svg";function Ge(e){switch(e){case"svg":return"http://www.w3.org/2000/svg";case"math":return"http://www.w3.org/1998/Math/MathML";default:return"http://www.w3.org/1999/xhtml"}}function je(e,t){return null==e||"http://www.w3.org/1999/xhtml"===e?Ge(t):"http://www.w3.org/2000/svg"===e&&"foreignObject"===t?"http://www.w3.org/1999/xhtml":e}var Fe,He=function(e){return"undefined"!=typeof MSApp&&MSApp.execUnsafeLocalFunction?function(t,o,n,a){MSApp.execUnsafeLocalFunction((function(){return e(t,o)}))}:e}((function(e,t){if(e.namespaceURI!==Re||"innerHTML"in e)e.innerHTML=t;else{for((Fe=Fe||document.createElement("div")).innerHTML="<svg>"+t.valueOf().toString()+"</svg>",t=Fe.firstChild;e.firstChild;)e.removeChild(e.firstChild);for(;t.firstChild;)e.appendChild(t.firstChild)}}));function Ne(e,t){if(t){var o=e.firstChild;if(o&&o===e.lastChild&&3===o.nodeType)return void(o.nodeValue=t)}e.textContent=t}function Ie(e,t){var o={};return o[e.toLowerCase()]=t.toLowerCase(),o["Webkit"+e]="webkit"+t,o["Moz"+e]="moz"+t,o}var Pe={animationend:Ie("Animation","AnimationEnd"),animationiteration:Ie("Animation","AnimationIteration"),animationstart:Ie("Animation","AnimationStart"),transitionend:Ie("Transition","TransitionEnd")},Oe={},Le={};function Ue(e){if(Oe[e])return Oe[e];if(!Pe[e])return e;var t,o=Pe[e];for(t in o)if(o.hasOwnProperty(t)&&t in Le)return Oe[e]=o[t];return e}Q&&(Le=document.createElement("div").style,"AnimationEvent"in window||(delete Pe.animationend.animation,delete Pe.animationiteration.animation,delete Pe.animationstart.animation),"TransitionEvent"in window||delete Pe.transitionend.transition);var We=Ue("animationend"),$e=Ue("animationiteration"),Qe=Ue("animationstart"),Ke=Ue("transitionend"),Je="abort canplay canplaythrough durationchange emptied encrypted ended error loadeddata loadedmetadata loadstart pause play playing progress ratechange seeked seeking stalled suspend timeupdate volumechange waiting".split(" "),Ye=new("function"==typeof WeakMap?WeakMap:Map);function Ze(e){var t=Ye.get(e);return void 0===t&&(t=new Map,Ye.set(e,t)),t}function Xe(e){var t=e,o=e;if(e.alternate)for(;t.return;)t=t.return;else{e=t;do{0!=(1026&(t=e).effectTag)&&(o=t.return),e=t.return}while(e)}return 3===t.tag?o:null}function et(e){if(13===e.tag){var t=e.memoizedState;if(null===t&&(null!==(e=e.alternate)&&(t=e.memoizedState)),null!==t)return t.dehydrated}return null}function tt(e){if(Xe(e)!==e)throw Error(r(188))}function ot(e){if(!(e=function(e){var t=e.alternate;if(!t){if(null===(t=Xe(e)))throw Error(r(188));return t!==e?null:e}for(var o=e,n=t;;){var a=o.return;if(null===a)break;var i=a.alternate;if(null===i){if(null!==(n=a.return)){o=n;continue}break}if(a.child===i.child){for(i=a.child;i;){if(i===o)return tt(a),e;if(i===n)return tt(a),t;i=i.sibling}throw Error(r(188))}if(o.return!==n.return)o=a,n=i;else{for(var s=!1,c=a.child;c;){if(c===o){s=!0,o=a,n=i;break}if(c===n){s=!0,n=a,o=i;break}c=c.sibling}if(!s){for(c=i.child;c;){if(c===o){s=!0,o=i,n=a;break}if(c===n){s=!0,n=i,o=a;break}c=c.sibling}if(!s)throw Error(r(189))}}if(o.alternate!==n)throw Error(r(190))}if(3!==o.tag)throw Error(r(188));return o.stateNode.current===o?e:t}(e)))return null;for(var t=e;;){if(5===t.tag||6===t.tag)return t;if(t.child)t.child.return=t,t=t.child;else{if(t===e)break;for(;!t.sibling;){if(!t.return||t.return===e)return null;t=t.return}t.sibling.return=t.return,t=t.sibling}}return null}function nt(e,t){if(null==t)throw Error(r(30));return null==e?t:Array.isArray(e)?Array.isArray(t)?(e.push.apply(e,t),e):(e.push(t),e):Array.isArray(t)?[e].concat(t):[e,t]}function at(e,t,o){Array.isArray(e)?e.forEach(t,o):e&&t.call(o,e)}var it=null;function rt(e){if(e){var t=e._dispatchListeners,o=e._dispatchInstances;if(Array.isArray(t))for(var n=0;n<t.length&&!e.isPropagationStopped();n++)b(e,t[n],o[n]);else t&&b(e,t,o);e._dispatchListeners=null,e._dispatchInstances=null,e.isPersistent()||e.constructor.release(e)}}function st(e){if(null!==e&&(it=nt(it,e)),e=it,it=null,e){if(at(e,rt),it)throw Error(r(95));if(l)throw e=u,l=!1,u=null,e}}function ct(e){return(e=e.target||e.srcElement||window).correspondingUseElement&&(e=e.correspondingUseElement),3===e.nodeType?e.parentNode:e}function mt(e){if(!Q)return!1;var t=(e="on"+e)in document;return t||((t=document.createElement("div")).setAttribute(e,"return;"),t="function"==typeof t[e]),t}var lt=[];function ut(e){e.topLevelType=null,e.nativeEvent=null,e.targetInst=null,e.ancestors.length=0,10>lt.length&&lt.push(e)}function dt(e,t,o,n){if(lt.length){var a=lt.pop();return a.topLevelType=e,a.eventSystemFlags=n,a.nativeEvent=t,a.targetInst=o,a}return{topLevelType:e,eventSystemFlags:n,nativeEvent:t,targetInst:o,ancestors:[]}}function ht(e){var t=e.targetInst,o=t;do{if(!o){e.ancestors.push(o);break}var n=o;if(3===n.tag)n=n.stateNode.containerInfo;else{for(;n.return;)n=n.return;n=3!==n.tag?null:n.stateNode.containerInfo}if(!n)break;5!==(t=o.tag)&&6!==t||e.ancestors.push(o),o=Do(n)}while(o);for(o=0;o<e.ancestors.length;o++){t=e.ancestors[o];var a=ct(e.nativeEvent);n=e.topLevelType;var i=e.nativeEvent,r=e.eventSystemFlags;0===o&&(r|=64);for(var s=null,c=0;c<O.length;c++){var m=O[c];m&&(m=m.extractEvents(n,t,i,a,r))&&(s=nt(s,m))}st(s)}}function pt(e,t,o){if(!o.has(e)){switch(e){case"scroll":Qt(t,"scroll",!0);break;case"focus":case"blur":Qt(t,"focus",!0),Qt(t,"blur",!0),o.set("blur",null),o.set("focus",null);break;case"cancel":case"close":mt(e)&&Qt(t,e,!0);break;case"invalid":case"submit":case"reset":break;default:-1===Je.indexOf(e)&&$t(e,t)}o.set(e,null)}}var gt,ft,bt,vt=!1,wt=[],yt=null,kt=null,Ct=null,At=new Map,xt=new Map,Mt=[],_t="mousedown mouseup touchcancel touchend touchstart auxclick dblclick pointercancel pointerdown pointerup dragend dragstart drop compositionend compositionstart keydown keypress keyup input textInput close cancel copy cut paste click change contextmenu reset submit".split(" "),Dt="focus blur dragenter dragleave mouseover mouseout pointerover pointerout gotpointercapture lostpointercapture".split(" ");function Et(e,t,o,n,a){return{blockedOn:e,topLevelType:t,eventSystemFlags:32|o,nativeEvent:a,container:n}}function Tt(e,t){switch(e){case"focus":case"blur":yt=null;break;case"dragenter":case"dragleave":kt=null;break;case"mouseover":case"mouseout":Ct=null;break;case"pointerover":case"pointerout":At.delete(t.pointerId);break;case"gotpointercapture":case"lostpointercapture":xt.delete(t.pointerId)}}function qt(e,t,o,n,a,i){return null===e||e.nativeEvent!==i?(e=Et(t,o,n,a,i),null!==t&&(null!==(t=Eo(t))&&ft(t)),e):(e.eventSystemFlags|=n,e)}function St(e){var t=Do(e.target);if(null!==t){var o=Xe(t);if(null!==o)if(13===(t=o.tag)){if(null!==(t=et(o)))return e.blockedOn=t,void i.unstable_runWithPriority(e.priority,(function(){bt(o)}))}else if(3===t&&o.stateNode.hydrate)return void(e.blockedOn=3===o.tag?o.stateNode.containerInfo:null)}e.blockedOn=null}function zt(e){if(null!==e.blockedOn)return!1;var t=Zt(e.topLevelType,e.eventSystemFlags,e.container,e.nativeEvent);if(null!==t){var o=Eo(t);return null!==o&&ft(o),e.blockedOn=t,!1}return!0}function Vt(e,t,o){zt(e)&&o.delete(t)}function Bt(){for(vt=!1;0<wt.length;){var e=wt[0];if(null!==e.blockedOn){null!==(e=Eo(e.blockedOn))&&gt(e);break}var t=Zt(e.topLevelType,e.eventSystemFlags,e.container,e.nativeEvent);null!==t?e.blockedOn=t:wt.shift()}null!==yt&&zt(yt)&&(yt=null),null!==kt&&zt(kt)&&(kt=null),null!==Ct&&zt(Ct)&&(Ct=null),At.forEach(Vt),xt.forEach(Vt)}function Rt(e,t){e.blockedOn===t&&(e.blockedOn=null,vt||(vt=!0,i.unstable_scheduleCallback(i.unstable_NormalPriority,Bt)))}function Gt(e){function t(t){return Rt(t,e)}if(0<wt.length){Rt(wt[0],e);for(var o=1;o<wt.length;o++){var n=wt[o];n.blockedOn===e&&(n.blockedOn=null)}}for(null!==yt&&Rt(yt,e),null!==kt&&Rt(kt,e),null!==Ct&&Rt(Ct,e),At.forEach(t),xt.forEach(t),o=0;o<Mt.length;o++)(n=Mt[o]).blockedOn===e&&(n.blockedOn=null);for(;0<Mt.length&&null===(o=Mt[0]).blockedOn;)St(o),null===o.blockedOn&&Mt.shift()}var jt={},Ft=new Map,Ht=new Map,Nt=["abort","abort",We,"animationEnd",$e,"animationIteration",Qe,"animationStart","canplay","canPlay","canplaythrough","canPlayThrough","durationchange","durationChange","emptied","emptied","encrypted","encrypted","ended","ended","error","error","gotpointercapture","gotPointerCapture","load","load","loadeddata","loadedData","loadedmetadata","loadedMetadata","loadstart","loadStart","lostpointercapture","lostPointerCapture","playing","playing","progress","progress","seeking","seeking","stalled","stalled","suspend","suspend","timeupdate","timeUpdate",Ke,"transitionEnd","waiting","waiting"];function It(e,t){for(var o=0;o<e.length;o+=2){var n=e[o],a=e[o+1],i="on"+(a[0].toUpperCase()+a.slice(1));i={phasedRegistrationNames:{bubbled:i,captured:i+"Capture"},dependencies:[n],eventPriority:t},Ht.set(n,t),Ft.set(n,i),jt[a]=i}}It("blur blur cancel cancel click click close close contextmenu contextMenu copy copy cut cut auxclick auxClick dblclick doubleClick dragend dragEnd dragstart dragStart drop drop focus focus input input invalid invalid keydown keyDown keypress keyPress keyup keyUp mousedown mouseDown mouseup mouseUp paste paste pause pause play play pointercancel pointerCancel pointerdown pointerDown pointerup pointerUp ratechange rateChange reset reset seeked seeked submit submit touchcancel touchCancel touchend touchEnd touchstart touchStart volumechange volumeChange".split(" "),0),It("drag drag dragenter dragEnter dragexit dragExit dragleave dragLeave dragover dragOver mousemove mouseMove mouseout mouseOut mouseover mouseOver pointermove pointerMove pointerout pointerOut pointerover pointerOver scroll scroll toggle toggle touchmove touchMove wheel wheel".split(" "),1),It(Nt,2);for(var Pt="change selectionchange textInput compositionstart compositionend compositionupdate".split(" "),Ot=0;Ot<Pt.length;Ot++)Ht.set(Pt[Ot],0);var Lt=i.unstable_UserBlockingPriority,Ut=i.unstable_runWithPriority,Wt=!0;function $t(e,t){Qt(t,e,!1)}function Qt(e,t,o){var n=Ht.get(t);switch(void 0===n?2:n){case 0:n=Kt.bind(null,t,1,e);break;case 1:n=Jt.bind(null,t,1,e);break;default:n=Yt.bind(null,t,1,e)}o?e.addEventListener(t,n,!0):e.addEventListener(t,n,!1)}function Kt(e,t,o,n){ie||ne();var a=Yt,i=ie;ie=!0;try{oe(a,e,t,o,n)}finally{(ie=i)||se()}}function Jt(e,t,o,n){Ut(Lt,Yt.bind(null,e,t,o,n))}function Yt(e,t,o,n){if(Wt)if(0<wt.length&&-1<_t.indexOf(e))e=Et(null,e,t,o,n),wt.push(e);else{var a=Zt(e,t,o,n);if(null===a)Tt(e,n);else if(-1<_t.indexOf(e))e=Et(a,e,t,o,n),wt.push(e);else if(!function(e,t,o,n,a){switch(t){case"focus":return yt=qt(yt,e,t,o,n,a),!0;case"dragenter":return kt=qt(kt,e,t,o,n,a),!0;case"mouseover":return Ct=qt(Ct,e,t,o,n,a),!0;case"pointerover":var i=a.pointerId;return At.set(i,qt(At.get(i)||null,e,t,o,n,a)),!0;case"gotpointercapture":return i=a.pointerId,xt.set(i,qt(xt.get(i)||null,e,t,o,n,a)),!0}return!1}(a,e,t,o,n)){Tt(e,n),e=dt(e,n,null,t);try{ce(ht,e)}finally{ut(e)}}}}function Zt(e,t,o,n){if(null!==(o=Do(o=ct(n)))){var a=Xe(o);if(null===a)o=null;else{var i=a.tag;if(13===i){if(null!==(o=et(a)))return o;o=null}else if(3===i){if(a.stateNode.hydrate)return 3===a.tag?a.stateNode.containerInfo:null;o=null}else a!==o&&(o=null)}}e=dt(e,n,o,t);try{ce(ht,e)}finally{ut(e)}return null}var Xt={animationIterationCount:!0,borderImageOutset:!0,borderImageSlice:!0,borderImageWidth:!0,boxFlex:!0,boxFlexGroup:!0,boxOrdinalGroup:!0,columnCount:!0,columns:!0,flex:!0,flexGrow:!0,flexPositive:!0,flexShrink:!0,flexNegative:!0,flexOrder:!0,gridArea:!0,gridRow:!0,gridRowEnd:!0,gridRowSpan:!0,gridRowStart:!0,gridColumn:!0,gridColumnEnd:!0,gridColumnSpan:!0,gridColumnStart:!0,fontWeight:!0,lineClamp:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,tabSize:!0,widows:!0,zIndex:!0,zoom:!0,fillOpacity:!0,floodOpacity:!0,stopOpacity:!0,strokeDasharray:!0,strokeDashoffset:!0,strokeMiterlimit:!0,strokeOpacity:!0,strokeWidth:!0},eo=["Webkit","ms","Moz","O"];function to(e,t,o){return null==t||"boolean"==typeof t||""===t?"":o||"number"!=typeof t||0===t||Xt.hasOwnProperty(e)&&Xt[e]?(""+t).trim():t+"px"}function oo(e,t){for(var o in e=e.style,t)if(t.hasOwnProperty(o)){var n=0===o.indexOf("--"),a=to(o,t[o],n);"float"===o&&(o="cssFloat"),n?e.setProperty(o,a):e[o]=a}}Object.keys(Xt).forEach((function(e){eo.forEach((function(t){t=t+e.charAt(0).toUpperCase()+e.substring(1),Xt[t]=Xt[e]}))}));var no=a({menuitem:!0},{area:!0,base:!0,br:!0,col:!0,embed:!0,hr:!0,img:!0,input:!0,keygen:!0,link:!0,meta:!0,param:!0,source:!0,track:!0,wbr:!0});function ao(e,t){if(t){if(no[e]&&(null!=t.children||null!=t.dangerouslySetInnerHTML))throw Error(r(137,e,""));if(null!=t.dangerouslySetInnerHTML){if(null!=t.children)throw Error(r(60));if(!("object"==typeof t.dangerouslySetInnerHTML&&"__html"in t.dangerouslySetInnerHTML))throw Error(r(61))}if(null!=t.style&&"object"!=typeof t.style)throw Error(r(62,""))}}function io(e,t){if(-1===e.indexOf("-"))return"string"==typeof t.is;switch(e){case"annotation-xml":case"color-profile":case"font-face":case"font-face-src":case"font-face-uri":case"font-face-format":case"font-face-name":case"missing-glyph":return!1;default:return!0}}var ro=Be;function so(e,t){var o=Ze(e=9===e.nodeType||11===e.nodeType?e:e.ownerDocument);t=W[t];for(var n=0;n<t.length;n++)pt(t[n],e,o)}function co(){}function mo(e){if(void 0===(e=e||("undefined"!=typeof document?document:void 0)))return null;try{return e.activeElement||e.body}catch(t){return e.body}}function lo(e){for(;e&&e.firstChild;)e=e.firstChild;return e}function uo(e,t){var o,n=lo(e);for(e=0;n;){if(3===n.nodeType){if(o=e+n.textContent.length,e<=t&&o>=t)return{node:n,offset:t-e};e=o}e:{for(;n;){if(n.nextSibling){n=n.nextSibling;break e}n=n.parentNode}n=void 0}n=lo(n)}}function ho(){for(var e=window,t=mo();t instanceof e.HTMLIFrameElement;){try{var o="string"==typeof t.contentWindow.location.href}catch(e){o=!1}if(!o)break;t=mo((e=t.contentWindow).document)}return t}function po(e){var t=e&&e.nodeName&&e.nodeName.toLowerCase();return t&&("input"===t&&("text"===e.type||"search"===e.type||"tel"===e.type||"url"===e.type||"password"===e.type)||"textarea"===t||"true"===e.contentEditable)}var go=null,fo=null;function bo(e,t){switch(e){case"button":case"input":case"select":case"textarea":return!!t.autoFocus}return!1}function vo(e,t){return"textarea"===e||"option"===e||"noscript"===e||"string"==typeof t.children||"number"==typeof t.children||"object"==typeof t.dangerouslySetInnerHTML&&null!==t.dangerouslySetInnerHTML&&null!=t.dangerouslySetInnerHTML.__html}var wo="function"==typeof setTimeout?setTimeout:void 0,yo="function"==typeof clearTimeout?clearTimeout:void 0;function ko(e){for(;null!=e;e=e.nextSibling){var t=e.nodeType;if(1===t||3===t)break}return e}function Co(e){e=e.previousSibling;for(var t=0;e;){if(8===e.nodeType){var o=e.data;if("$"===o||"$!"===o||"$?"===o){if(0===t)return e;t--}else"/$"===o&&t++}e=e.previousSibling}return null}var Ao=Math.random().toString(36).slice(2),xo="__reactInternalInstance$"+Ao,Mo="__reactEventHandlers$"+Ao,_o="__reactContainere$"+Ao;function Do(e){var t=e[xo];if(t)return t;for(var o=e.parentNode;o;){if(t=o[_o]||o[xo]){if(o=t.alternate,null!==t.child||null!==o&&null!==o.child)for(e=Co(e);null!==e;){if(o=e[xo])return o;e=Co(e)}return t}o=(e=o).parentNode}return null}function Eo(e){return!(e=e[xo]||e[_o])||5!==e.tag&&6!==e.tag&&13!==e.tag&&3!==e.tag?null:e}function To(e){if(5===e.tag||6===e.tag)return e.stateNode;throw Error(r(33))}function qo(e){return e[Mo]||null}function So(e){do{e=e.return}while(e&&5!==e.tag);return e||null}function zo(e,t){var o=e.stateNode;if(!o)return null;var n=p(o);if(!n)return null;o=n[t];e:switch(t){case"onClick":case"onClickCapture":case"onDoubleClick":case"onDoubleClickCapture":case"onMouseDown":case"onMouseDownCapture":case"onMouseMove":case"onMouseMoveCapture":case"onMouseUp":case"onMouseUpCapture":case"onMouseEnter":(n=!n.disabled)||(n=!("button"===(e=e.type)||"input"===e||"select"===e||"textarea"===e)),e=!n;break e;default:e=!1}if(e)return null;if(o&&"function"!=typeof o)throw Error(r(231,t,typeof o));return o}function Vo(e,t,o){(t=zo(e,o.dispatchConfig.phasedRegistrationNames[t]))&&(o._dispatchListeners=nt(o._dispatchListeners,t),o._dispatchInstances=nt(o._dispatchInstances,e))}function Bo(e){if(e&&e.dispatchConfig.phasedRegistrationNames){for(var t=e._targetInst,o=[];t;)o.push(t),t=So(t);for(t=o.length;0<t--;)Vo(o[t],"captured",e);for(t=0;t<o.length;t++)Vo(o[t],"bubbled",e)}}function Ro(e,t,o){e&&o&&o.dispatchConfig.registrationName&&(t=zo(e,o.dispatchConfig.registrationName))&&(o._dispatchListeners=nt(o._dispatchListeners,t),o._dispatchInstances=nt(o._dispatchInstances,e))}function Go(e){e&&e.dispatchConfig.registrationName&&Ro(e._targetInst,null,e)}function jo(e){at(e,Bo)}var Fo=null,Ho=null,No=null;function Io(){if(No)return No;var e,t,o=Ho,n=o.length,a="value"in Fo?Fo.value:Fo.textContent,i=a.length;for(e=0;e<n&&o[e]===a[e];e++);var r=n-e;for(t=1;t<=r&&o[n-t]===a[i-t];t++);return No=a.slice(e,1<t?1-t:void 0)}function Po(){return!0}function Oo(){return!1}function Lo(e,t,o,n){for(var a in this.dispatchConfig=e,this._targetInst=t,this.nativeEvent=o,e=this.constructor.Interface)e.hasOwnProperty(a)&&((t=e[a])?this[a]=t(o):"target"===a?this.target=n:this[a]=o[a]);return this.isDefaultPrevented=(null!=o.defaultPrevented?o.defaultPrevented:!1===o.returnValue)?Po:Oo,this.isPropagationStopped=Oo,this}function Uo(e,t,o,n){if(this.eventPool.length){var a=this.eventPool.pop();return this.call(a,e,t,o,n),a}return new this(e,t,o,n)}function Wo(e){if(!(e instanceof this))throw Error(r(279));e.destructor(),10>this.eventPool.length&&this.eventPool.push(e)}function $o(e){e.eventPool=[],e.getPooled=Uo,e.release=Wo}a(Lo.prototype,{preventDefault:function(){this.defaultPrevented=!0;var e=this.nativeEvent;e&&(e.preventDefault?e.preventDefault():"unknown"!=typeof e.returnValue&&(e.returnValue=!1),this.isDefaultPrevented=Po)},stopPropagation:function(){var e=this.nativeEvent;e&&(e.stopPropagation?e.stopPropagation():"unknown"!=typeof e.cancelBubble&&(e.cancelBubble=!0),this.isPropagationStopped=Po)},persist:function(){this.isPersistent=Po},isPersistent:Oo,destructor:function(){var e,t=this.constructor.Interface;for(e in t)this[e]=null;this.nativeEvent=this._targetInst=this.dispatchConfig=null,this.isPropagationStopped=this.isDefaultPrevented=Oo,this._dispatchInstances=this._dispatchListeners=null}}),Lo.Interface={type:null,target:null,currentTarget:function(){return null},eventPhase:null,bubbles:null,cancelable:null,timeStamp:function(e){return e.timeStamp||Date.now()},defaultPrevented:null,isTrusted:null},Lo.extend=function(e){function t(){}function o(){return n.apply(this,arguments)}var n=this;t.prototype=n.prototype;var i=new t;return a(i,o.prototype),o.prototype=i,o.prototype.constructor=o,o.Interface=a({},n.Interface,e),o.extend=n.extend,$o(o),o},$o(Lo);var Qo=Lo.extend({data:null}),Ko=Lo.extend({data:null}),Jo=[9,13,27,32],Yo=Q&&"CompositionEvent"in window,Zo=null;Q&&"documentMode"in document&&(Zo=document.documentMode);var Xo=Q&&"TextEvent"in window&&!Zo,en=Q&&(!Yo||Zo&&8<Zo&&11>=Zo),tn=String.fromCharCode(32),on={beforeInput:{phasedRegistrationNames:{bubbled:"onBeforeInput",captured:"onBeforeInputCapture"},dependencies:["compositionend","keypress","textInput","paste"]},compositionEnd:{phasedRegistrationNames:{bubbled:"onCompositionEnd",captured:"onCompositionEndCapture"},dependencies:"blur compositionend keydown keypress keyup mousedown".split(" ")},compositionStart:{phasedRegistrationNames:{bubbled:"onCompositionStart",captured:"onCompositionStartCapture"},dependencies:"blur compositionstart keydown keypress keyup mousedown".split(" ")},compositionUpdate:{phasedRegistrationNames:{bubbled:"onCompositionUpdate",captured:"onCompositionUpdateCapture"},dependencies:"blur compositionupdate keydown keypress keyup mousedown".split(" ")}},nn=!1;function an(e,t){switch(e){case"keyup":return-1!==Jo.indexOf(t.keyCode);case"keydown":return 229!==t.keyCode;case"keypress":case"mousedown":case"blur":return!0;default:return!1}}function rn(e){return"object"==typeof(e=e.detail)&&"data"in e?e.data:null}var sn=!1;var cn={eventTypes:on,extractEvents:function(e,t,o,n){var a;if(Yo)e:{switch(e){case"compositionstart":var i=on.compositionStart;break e;case"compositionend":i=on.compositionEnd;break e;case"compositionupdate":i=on.compositionUpdate;break e}i=void 0}else sn?an(e,o)&&(i=on.compositionEnd):"keydown"===e&&229===o.keyCode&&(i=on.compositionStart);return i?(en&&"ko"!==o.locale&&(sn||i!==on.compositionStart?i===on.compositionEnd&&sn&&(a=Io()):(Ho="value"in(Fo=n)?Fo.value:Fo.textContent,sn=!0)),i=Qo.getPooled(i,t,o,n),a?i.data=a:null!==(a=rn(o))&&(i.data=a),jo(i),a=i):a=null,(e=Xo?function(e,t){switch(e){case"compositionend":return rn(t);case"keypress":return 32!==t.which?null:(nn=!0,tn);case"textInput":return(e=t.data)===tn&&nn?null:e;default:return null}}(e,o):function(e,t){if(sn)return"compositionend"===e||!Yo&&an(e,t)?(e=Io(),No=Ho=Fo=null,sn=!1,e):null;switch(e){case"paste":return null;case"keypress":if(!(t.ctrlKey||t.altKey||t.metaKey)||t.ctrlKey&&t.altKey){if(t.char&&1<t.char.length)return t.char;if(t.which)return String.fromCharCode(t.which)}return null;case"compositionend":return en&&"ko"!==t.locale?null:t.data;default:return null}}(e,o))?((t=Ko.getPooled(on.beforeInput,t,o,n)).data=e,jo(t)):t=null,null===a?t:null===t?a:[a,t]}},mn={color:!0,date:!0,datetime:!0,"datetime-local":!0,email:!0,month:!0,number:!0,password:!0,range:!0,search:!0,tel:!0,text:!0,time:!0,url:!0,week:!0};function ln(e){var t=e&&e.nodeName&&e.nodeName.toLowerCase();return"input"===t?!!mn[e.type]:"textarea"===t}var un={change:{phasedRegistrationNames:{bubbled:"onChange",captured:"onChangeCapture"},dependencies:"blur change click focus input keydown keyup selectionchange".split(" ")}};function dn(e,t,o){return(e=Lo.getPooled(un.change,e,t,o)).type="change",X(o),jo(e),e}var hn=null,pn=null;function gn(e){st(e)}function fn(e){if(ke(To(e)))return e}function bn(e,t){if("change"===e)return t}var vn=!1;function wn(){hn&&(hn.detachEvent("onpropertychange",yn),pn=hn=null)}function yn(e){if("value"===e.propertyName&&fn(pn))if(e=dn(pn,e,ct(e)),ie)st(e);else{ie=!0;try{te(gn,e)}finally{ie=!1,se()}}}function kn(e,t,o){"focus"===e?(wn(),pn=o,(hn=t).attachEvent("onpropertychange",yn)):"blur"===e&&wn()}function Cn(e){if("selectionchange"===e||"keyup"===e||"keydown"===e)return fn(pn)}function An(e,t){if("click"===e)return fn(t)}function xn(e,t){if("input"===e||"change"===e)return fn(t)}Q&&(vn=mt("input")&&(!document.documentMode||9<document.documentMode));var Mn={eventTypes:un,_isInputEventSupported:vn,extractEvents:function(e,t,o,n){var a=t?To(t):window,i=a.nodeName&&a.nodeName.toLowerCase();if("select"===i||"input"===i&&"file"===a.type)var r=bn;else if(ln(a))if(vn)r=xn;else{r=Cn;var s=kn}else(i=a.nodeName)&&"input"===i.toLowerCase()&&("checkbox"===a.type||"radio"===a.type)&&(r=An);if(r&&(r=r(e,t)))return dn(r,o,n);s&&s(e,a,t),"blur"===e&&(e=a._wrapperState)&&e.controlled&&"number"===a.type&&De(a,"number",a.value)}},_n=Lo.extend({view:null,detail:null}),Dn={Alt:"altKey",Control:"ctrlKey",Meta:"metaKey",Shift:"shiftKey"};function En(e){var t=this.nativeEvent;return t.getModifierState?t.getModifierState(e):!!(e=Dn[e])&&!!t[e]}function Tn(){return En}var qn=0,Sn=0,zn=!1,Vn=!1,Bn=_n.extend({screenX:null,screenY:null,clientX:null,clientY:null,pageX:null,pageY:null,ctrlKey:null,shiftKey:null,altKey:null,metaKey:null,getModifierState:Tn,button:null,buttons:null,relatedTarget:function(e){return e.relatedTarget||(e.fromElement===e.srcElement?e.toElement:e.fromElement)},movementX:function(e){if("movementX"in e)return e.movementX;var t=qn;return qn=e.screenX,zn?"mousemove"===e.type?e.screenX-t:0:(zn=!0,0)},movementY:function(e){if("movementY"in e)return e.movementY;var t=Sn;return Sn=e.screenY,Vn?"mousemove"===e.type?e.screenY-t:0:(Vn=!0,0)}}),Rn=Bn.extend({pointerId:null,width:null,height:null,pressure:null,tangentialPressure:null,tiltX:null,tiltY:null,twist:null,pointerType:null,isPrimary:null}),Gn={mouseEnter:{registrationName:"onMouseEnter",dependencies:["mouseout","mouseover"]},mouseLeave:{registrationName:"onMouseLeave",dependencies:["mouseout","mouseover"]},pointerEnter:{registrationName:"onPointerEnter",dependencies:["pointerout","pointerover"]},pointerLeave:{registrationName:"onPointerLeave",dependencies:["pointerout","pointerover"]}},jn={eventTypes:Gn,extractEvents:function(e,t,o,n,a){var i="mouseover"===e||"pointerover"===e,r="mouseout"===e||"pointerout"===e;if(i&&0==(32&a)&&(o.relatedTarget||o.fromElement)||!r&&!i)return null;(i=n.window===n?n:(i=n.ownerDocument)?i.defaultView||i.parentWindow:window,r)?(r=t,null!==(t=(t=o.relatedTarget||o.toElement)?Do(t):null)&&(t!==Xe(t)||5!==t.tag&&6!==t.tag)&&(t=null)):r=null;if(r===t)return null;if("mouseout"===e||"mouseover"===e)var s=Bn,c=Gn.mouseLeave,m=Gn.mouseEnter,l="mouse";else"pointerout"!==e&&"pointerover"!==e||(s=Rn,c=Gn.pointerLeave,m=Gn.pointerEnter,l="pointer");if(e=null==r?i:To(r),i=null==t?i:To(t),(c=s.getPooled(c,r,o,n)).type=l+"leave",c.target=e,c.relatedTarget=i,(o=s.getPooled(m,t,o,n)).type=l+"enter",o.target=i,o.relatedTarget=e,l=t,(n=r)&&l)e:{for(m=l,r=0,e=s=n;e;e=So(e))r++;for(e=0,t=m;t;t=So(t))e++;for(;0<r-e;)s=So(s),r--;for(;0<e-r;)m=So(m),e--;for(;r--;){if(s===m||s===m.alternate)break e;s=So(s),m=So(m)}s=null}else s=null;for(m=s,s=[];n&&n!==m&&(null===(r=n.alternate)||r!==m);)s.push(n),n=So(n);for(n=[];l&&l!==m&&(null===(r=l.alternate)||r!==m);)n.push(l),l=So(l);for(l=0;l<s.length;l++)Ro(s[l],"bubbled",c);for(l=n.length;0<l--;)Ro(n[l],"captured",o);return 0==(64&a)?[c]:[c,o]}};var Fn="function"==typeof Object.is?Object.is:function(e,t){return e===t&&(0!==e||1/e==1/t)||e!=e&&t!=t},Hn=Object.prototype.hasOwnProperty;function Nn(e,t){if(Fn(e,t))return!0;if("object"!=typeof e||null===e||"object"!=typeof t||null===t)return!1;var o=Object.keys(e),n=Object.keys(t);if(o.length!==n.length)return!1;for(n=0;n<o.length;n++)if(!Hn.call(t,o[n])||!Fn(e[o[n]],t[o[n]]))return!1;return!0}var In=Q&&"documentMode"in document&&11>=document.documentMode,Pn={select:{phasedRegistrationNames:{bubbled:"onSelect",captured:"onSelectCapture"},dependencies:"blur contextmenu dragend focus keydown keyup mousedown mouseup selectionchange".split(" ")}},On=null,Ln=null,Un=null,Wn=!1;function $n(e,t){var o=t.window===t?t.document:9===t.nodeType?t:t.ownerDocument;return Wn||null==On||On!==mo(o)?null:("selectionStart"in(o=On)&&po(o)?o={start:o.selectionStart,end:o.selectionEnd}:o={anchorNode:(o=(o.ownerDocument&&o.ownerDocument.defaultView||window).getSelection()).anchorNode,anchorOffset:o.anchorOffset,focusNode:o.focusNode,focusOffset:o.focusOffset},Un&&Nn(Un,o)?null:(Un=o,(e=Lo.getPooled(Pn.select,Ln,e,t)).type="select",e.target=On,jo(e),e))}var Qn={eventTypes:Pn,extractEvents:function(e,t,o,n,a,i){if(!(i=!(a=i||(n.window===n?n.document:9===n.nodeType?n:n.ownerDocument)))){e:{a=Ze(a),i=W.onSelect;for(var r=0;r<i.length;r++)if(!a.has(i[r])){a=!1;break e}a=!0}i=!a}if(i)return null;switch(a=t?To(t):window,e){case"focus":(ln(a)||"true"===a.contentEditable)&&(On=a,Ln=t,Un=null);break;case"blur":Un=Ln=On=null;break;case"mousedown":Wn=!0;break;case"contextmenu":case"mouseup":case"dragend":return Wn=!1,$n(o,n);case"selectionchange":if(In)break;case"keydown":case"keyup":return $n(o,n)}return null}},Kn=Lo.extend({animationName:null,elapsedTime:null,pseudoElement:null}),Jn=Lo.extend({clipboardData:function(e){return"clipboardData"in e?e.clipboardData:window.clipboardData}}),Yn=_n.extend({relatedTarget:null});function Zn(e){var t=e.keyCode;return"charCode"in e?0===(e=e.charCode)&&13===t&&(e=13):e=t,10===e&&(e=13),32<=e||13===e?e:0}var Xn={Esc:"Escape",Spacebar:" ",Left:"ArrowLeft",Up:"ArrowUp",Right:"ArrowRight",Down:"ArrowDown",Del:"Delete",Win:"OS",Menu:"ContextMenu",Apps:"ContextMenu",Scroll:"ScrollLock",MozPrintableKey:"Unidentified"},ea={8:"Backspace",9:"Tab",12:"Clear",13:"Enter",16:"Shift",17:"Control",18:"Alt",19:"Pause",20:"CapsLock",27:"Escape",32:" ",33:"PageUp",34:"PageDown",35:"End",36:"Home",37:"ArrowLeft",38:"ArrowUp",39:"ArrowRight",40:"ArrowDown",45:"Insert",46:"Delete",112:"F1",113:"F2",114:"F3",115:"F4",116:"F5",117:"F6",118:"F7",119:"F8",120:"F9",121:"F10",122:"F11",123:"F12",144:"NumLock",145:"ScrollLock",224:"Meta"},ta=_n.extend({key:function(e){if(e.key){var t=Xn[e.key]||e.key;if("Unidentified"!==t)return t}return"keypress"===e.type?13===(e=Zn(e))?"Enter":String.fromCharCode(e):"keydown"===e.type||"keyup"===e.type?ea[e.keyCode]||"Unidentified":""},location:null,ctrlKey:null,shiftKey:null,altKey:null,metaKey:null,repeat:null,locale:null,getModifierState:Tn,charCode:function(e){return"keypress"===e.type?Zn(e):0},keyCode:function(e){return"keydown"===e.type||"keyup"===e.type?e.keyCode:0},which:function(e){return"keypress"===e.type?Zn(e):"keydown"===e.type||"keyup"===e.type?e.keyCode:0}}),oa=Bn.extend({dataTransfer:null}),na=_n.extend({touches:null,targetTouches:null,changedTouches:null,altKey:null,metaKey:null,ctrlKey:null,shiftKey:null,getModifierState:Tn}),aa=Lo.extend({propertyName:null,elapsedTime:null,pseudoElement:null}),ia=Bn.extend({deltaX:function(e){return"deltaX"in e?e.deltaX:"wheelDeltaX"in e?-e.wheelDeltaX:0},deltaY:function(e){return"deltaY"in e?e.deltaY:"wheelDeltaY"in e?-e.wheelDeltaY:"wheelDelta"in e?-e.wheelDelta:0},deltaZ:null,deltaMode:null}),ra={eventTypes:jt,extractEvents:function(e,t,o,n){var a=Ft.get(e);if(!a)return null;switch(e){case"keypress":if(0===Zn(o))return null;case"keydown":case"keyup":e=ta;break;case"blur":case"focus":e=Yn;break;case"click":if(2===o.button)return null;case"auxclick":case"dblclick":case"mousedown":case"mousemove":case"mouseup":case"mouseout":case"mouseover":case"contextmenu":e=Bn;break;case"drag":case"dragend":case"dragenter":case"dragexit":case"dragleave":case"dragover":case"dragstart":case"drop":e=oa;break;case"touchcancel":case"touchend":case"touchmove":case"touchstart":e=na;break;case We:case $e:case Qe:e=Kn;break;case Ke:e=aa;break;case"scroll":e=_n;break;case"wheel":e=ia;break;case"copy":case"cut":case"paste":e=Jn;break;case"gotpointercapture":case"lostpointercapture":case"pointercancel":case"pointerdown":case"pointermove":case"pointerout":case"pointerover":case"pointerup":e=Rn;break;default:e=Lo}return jo(t=e.getPooled(a,t,o,n)),t}};if(H)throw Error(r(101));H=Array.prototype.slice.call("ResponderEventPlugin SimpleEventPlugin EnterLeaveEventPlugin ChangeEventPlugin SelectEventPlugin BeforeInputEventPlugin".split(" ")),I(),p=qo,g=Eo,f=To,$({SimpleEventPlugin:ra,EnterLeaveEventPlugin:jn,ChangeEventPlugin:Mn,SelectEventPlugin:Qn,BeforeInputEventPlugin:cn});var sa=[],ca=-1;function ma(e){0>ca||(e.current=sa[ca],sa[ca]=null,ca--)}function la(e,t){ca++,sa[ca]=e.current,e.current=t}var ua={},da={current:ua},ha={current:!1},pa=ua;function ga(e,t){var o=e.type.contextTypes;if(!o)return ua;var n=e.stateNode;if(n&&n.__reactInternalMemoizedUnmaskedChildContext===t)return n.__reactInternalMemoizedMaskedChildContext;var a,i={};for(a in o)i[a]=t[a];return n&&((e=e.stateNode).__reactInternalMemoizedUnmaskedChildContext=t,e.__reactInternalMemoizedMaskedChildContext=i),i}function fa(e){return null!=(e=e.childContextTypes)}function ba(){ma(ha),ma(da)}function va(e,t,o){if(da.current!==ua)throw Error(r(168));la(da,t),la(ha,o)}function wa(e,t,o){var n=e.stateNode;if(e=t.childContextTypes,"function"!=typeof n.getChildContext)return o;for(var i in n=n.getChildContext())if(!(i in e))throw Error(r(108,j(t)||"Unknown",i));return a({},o,{},n)}function ya(e){return e=(e=e.stateNode)&&e.__reactInternalMemoizedMergedChildContext||ua,pa=da.current,la(da,e),la(ha,ha.current),!0}function ka(e,t,o){var n=e.stateNode;if(!n)throw Error(r(169));o?(e=wa(e,t,pa),n.__reactInternalMemoizedMergedChildContext=e,ma(ha),ma(da),la(da,e)):ma(ha),la(ha,o)}var Ca=i.unstable_runWithPriority,Aa=i.unstable_scheduleCallback,xa=i.unstable_cancelCallback,Ma=i.unstable_requestPaint,_a=i.unstable_now,Da=i.unstable_getCurrentPriorityLevel,Ea=i.unstable_ImmediatePriority,Ta=i.unstable_UserBlockingPriority,qa=i.unstable_NormalPriority,Sa=i.unstable_LowPriority,za=i.unstable_IdlePriority,Va={},Ba=i.unstable_shouldYield,Ra=void 0!==Ma?Ma:function(){},Ga=null,ja=null,Fa=!1,Ha=_a(),Na=1e4>Ha?_a:function(){return _a()-Ha};function Ia(){switch(Da()){case Ea:return 99;case Ta:return 98;case qa:return 97;case Sa:return 96;case za:return 95;default:throw Error(r(332))}}function Pa(e){switch(e){case 99:return Ea;case 98:return Ta;case 97:return qa;case 96:return Sa;case 95:return za;default:throw Error(r(332))}}function Oa(e,t){return e=Pa(e),Ca(e,t)}function La(e,t,o){return e=Pa(e),Aa(e,t,o)}function Ua(e){return null===Ga?(Ga=[e],ja=Aa(Ea,$a)):Ga.push(e),Va}function Wa(){if(null!==ja){var e=ja;ja=null,xa(e)}$a()}function $a(){if(!Fa&&null!==Ga){Fa=!0;var e=0;try{var t=Ga;Oa(99,(function(){for(;e<t.length;e++){var o=t[e];do{o=o(!0)}while(null!==o)}})),Ga=null}catch(t){throw null!==Ga&&(Ga=Ga.slice(e+1)),Aa(Ea,Wa),t}finally{Fa=!1}}}function Qa(e,t,o){return 1073741821-(1+((1073741821-e+t/10)/(o/=10)|0))*o}function Ka(e,t){if(e&&e.defaultProps)for(var o in t=a({},t),e=e.defaultProps)void 0===t[o]&&(t[o]=e[o]);return t}var Ja={current:null},Ya=null,Za=null,Xa=null;function ei(){Xa=Za=Ya=null}function ti(e){var t=Ja.current;ma(Ja),e.type._context._currentValue=t}function oi(e,t){for(;null!==e;){var o=e.alternate;if(e.childExpirationTime<t)e.childExpirationTime=t,null!==o&&o.childExpirationTime<t&&(o.childExpirationTime=t);else{if(!(null!==o&&o.childExpirationTime<t))break;o.childExpirationTime=t}e=e.return}}function ni(e,t){Ya=e,Xa=Za=null,null!==(e=e.dependencies)&&null!==e.firstContext&&(e.expirationTime>=t&&(qr=!0),e.firstContext=null)}function ai(e,t){if(Xa!==e&&!1!==t&&0!==t)if("number"==typeof t&&1073741823!==t||(Xa=e,t=1073741823),t={context:e,observedBits:t,next:null},null===Za){if(null===Ya)throw Error(r(308));Za=t,Ya.dependencies={expirationTime:0,firstContext:t,responders:null}}else Za=Za.next=t;return e._currentValue}var ii=!1;function ri(e){e.updateQueue={baseState:e.memoizedState,baseQueue:null,shared:{pending:null},effects:null}}function si(e,t){e=e.updateQueue,t.updateQueue===e&&(t.updateQueue={baseState:e.baseState,baseQueue:e.baseQueue,shared:e.shared,effects:e.effects})}function ci(e,t){return(e={expirationTime:e,suspenseConfig:t,tag:0,payload:null,callback:null,next:null}).next=e}function mi(e,t){if(null!==(e=e.updateQueue)){var o=(e=e.shared).pending;null===o?t.next=t:(t.next=o.next,o.next=t),e.pending=t}}function li(e,t){var o=e.alternate;null!==o&&si(o,e),null===(o=(e=e.updateQueue).baseQueue)?(e.baseQueue=t.next=t,t.next=t):(t.next=o.next,o.next=t)}function ui(e,t,o,n){var i=e.updateQueue;ii=!1;var r=i.baseQueue,s=i.shared.pending;if(null!==s){if(null!==r){var c=r.next;r.next=s.next,s.next=c}r=s,i.shared.pending=null,null!==(c=e.alternate)&&(null!==(c=c.updateQueue)&&(c.baseQueue=s))}if(null!==r){c=r.next;var m=i.baseState,l=0,u=null,d=null,h=null;if(null!==c)for(var p=c;;){if((s=p.expirationTime)<n){var g={expirationTime:p.expirationTime,suspenseConfig:p.suspenseConfig,tag:p.tag,payload:p.payload,callback:p.callback,next:null};null===h?(d=h=g,u=m):h=h.next=g,s>l&&(l=s)}else{null!==h&&(h=h.next={expirationTime:1073741823,suspenseConfig:p.suspenseConfig,tag:p.tag,payload:p.payload,callback:p.callback,next:null}),ic(s,p.suspenseConfig);e:{var f=e,b=p;switch(s=t,g=o,b.tag){case 1:if("function"==typeof(f=b.payload)){m=f.call(g,m,s);break e}m=f;break e;case 3:f.effectTag=-4097&f.effectTag|64;case 0:if(null==(s="function"==typeof(f=b.payload)?f.call(g,m,s):f))break e;m=a({},m,s);break e;case 2:ii=!0}}null!==p.callback&&(e.effectTag|=32,null===(s=i.effects)?i.effects=[p]:s.push(p))}if(null===(p=p.next)||p===c){if(null===(s=i.shared.pending))break;p=r.next=s.next,s.next=c,i.baseQueue=r=s,i.shared.pending=null}}null===h?u=m:h.next=d,i.baseState=u,i.baseQueue=h,rc(l),e.expirationTime=l,e.memoizedState=m}}function di(e,t,o){if(e=t.effects,t.effects=null,null!==e)for(t=0;t<e.length;t++){var n=e[t],a=n.callback;if(null!==a){if(n.callback=null,n=a,a=o,"function"!=typeof n)throw Error(r(191,n));n.call(a)}}}var hi=v.ReactCurrentBatchConfig,pi=(new n.Component).refs;function gi(e,t,o,n){o=null==(o=o(n,t=e.memoizedState))?t:a({},t,o),e.memoizedState=o,0===e.expirationTime&&(e.updateQueue.baseState=o)}var fi={isMounted:function(e){return!!(e=e._reactInternalFiber)&&Xe(e)===e},enqueueSetState:function(e,t,o){e=e._reactInternalFiber;var n=Ws(),a=hi.suspense;(a=ci(n=$s(n,e,a),a)).payload=t,null!=o&&(a.callback=o),mi(e,a),Qs(e,n)},enqueueReplaceState:function(e,t,o){e=e._reactInternalFiber;var n=Ws(),a=hi.suspense;(a=ci(n=$s(n,e,a),a)).tag=1,a.payload=t,null!=o&&(a.callback=o),mi(e,a),Qs(e,n)},enqueueForceUpdate:function(e,t){e=e._reactInternalFiber;var o=Ws(),n=hi.suspense;(n=ci(o=$s(o,e,n),n)).tag=2,null!=t&&(n.callback=t),mi(e,n),Qs(e,o)}};function bi(e,t,o,n,a,i,r){return"function"==typeof(e=e.stateNode).shouldComponentUpdate?e.shouldComponentUpdate(n,i,r):!t.prototype||!t.prototype.isPureReactComponent||(!Nn(o,n)||!Nn(a,i))}function vi(e,t,o){var n=!1,a=ua,i=t.contextType;return"object"==typeof i&&null!==i?i=ai(i):(a=fa(t)?pa:da.current,i=(n=null!=(n=t.contextTypes))?ga(e,a):ua),t=new t(o,i),e.memoizedState=null!==t.state&&void 0!==t.state?t.state:null,t.updater=fi,e.stateNode=t,t._reactInternalFiber=e,n&&((e=e.stateNode).__reactInternalMemoizedUnmaskedChildContext=a,e.__reactInternalMemoizedMaskedChildContext=i),t}function wi(e,t,o,n){e=t.state,"function"==typeof t.componentWillReceiveProps&&t.componentWillReceiveProps(o,n),"function"==typeof t.UNSAFE_componentWillReceiveProps&&t.UNSAFE_componentWillReceiveProps(o,n),t.state!==e&&fi.enqueueReplaceState(t,t.state,null)}function yi(e,t,o,n){var a=e.stateNode;a.props=o,a.state=e.memoizedState,a.refs=pi,ri(e);var i=t.contextType;"object"==typeof i&&null!==i?a.context=ai(i):(i=fa(t)?pa:da.current,a.context=ga(e,i)),ui(e,o,a,n),a.state=e.memoizedState,"function"==typeof(i=t.getDerivedStateFromProps)&&(gi(e,t,i,o),a.state=e.memoizedState),"function"==typeof t.getDerivedStateFromProps||"function"==typeof a.getSnapshotBeforeUpdate||"function"!=typeof a.UNSAFE_componentWillMount&&"function"!=typeof a.componentWillMount||(t=a.state,"function"==typeof a.componentWillMount&&a.componentWillMount(),"function"==typeof a.UNSAFE_componentWillMount&&a.UNSAFE_componentWillMount(),t!==a.state&&fi.enqueueReplaceState(a,a.state,null),ui(e,o,a,n),a.state=e.memoizedState),"function"==typeof a.componentDidMount&&(e.effectTag|=4)}var ki=Array.isArray;function Ci(e,t,o){if(null!==(e=o.ref)&&"function"!=typeof e&&"object"!=typeof e){if(o._owner){if(o=o._owner){if(1!==o.tag)throw Error(r(309));var n=o.stateNode}if(!n)throw Error(r(147,e));var a=""+e;return null!==t&&null!==t.ref&&"function"==typeof t.ref&&t.ref._stringRef===a?t.ref:((t=function(e){var t=n.refs;t===pi&&(t=n.refs={}),null===e?delete t[a]:t[a]=e})._stringRef=a,t)}if("string"!=typeof e)throw Error(r(284));if(!o._owner)throw Error(r(290,e))}return e}function Ai(e,t){if("textarea"!==e.type)throw Error(r(31,"[object Object]"===Object.prototype.toString.call(t)?"object with keys {"+Object.keys(t).join(", ")+"}":t,""))}function xi(e){function t(t,o){if(e){var n=t.lastEffect;null!==n?(n.nextEffect=o,t.lastEffect=o):t.firstEffect=t.lastEffect=o,o.nextEffect=null,o.effectTag=8}}function o(o,n){if(!e)return null;for(;null!==n;)t(o,n),n=n.sibling;return null}function n(e,t){for(e=new Map;null!==t;)null!==t.key?e.set(t.key,t):e.set(t.index,t),t=t.sibling;return e}function a(e,t){return(e=_c(e,t)).index=0,e.sibling=null,e}function i(t,o,n){return t.index=n,e?null!==(n=t.alternate)?(n=n.index)<o?(t.effectTag=2,o):n:(t.effectTag=2,o):o}function s(t){return e&&null===t.alternate&&(t.effectTag=2),t}function c(e,t,o,n){return null===t||6!==t.tag?((t=Tc(o,e.mode,n)).return=e,t):((t=a(t,o)).return=e,t)}function m(e,t,o,n){return null!==t&&t.elementType===o.type?((n=a(t,o.props)).ref=Ci(e,t,o),n.return=e,n):((n=Dc(o.type,o.key,o.props,null,e.mode,n)).ref=Ci(e,t,o),n.return=e,n)}function l(e,t,o,n){return null===t||4!==t.tag||t.stateNode.containerInfo!==o.containerInfo||t.stateNode.implementation!==o.implementation?((t=qc(o,e.mode,n)).return=e,t):((t=a(t,o.children||[])).return=e,t)}function u(e,t,o,n,i){return null===t||7!==t.tag?((t=Ec(o,e.mode,n,i)).return=e,t):((t=a(t,o)).return=e,t)}function d(e,t,o){if("string"==typeof t||"number"==typeof t)return(t=Tc(""+t,e.mode,o)).return=e,t;if("object"==typeof t&&null!==t){switch(t.$$typeof){case k:return(o=Dc(t.type,t.key,t.props,null,e.mode,o)).ref=Ci(e,null,t),o.return=e,o;case C:return(t=qc(t,e.mode,o)).return=e,t}if(ki(t)||G(t))return(t=Ec(t,e.mode,o,null)).return=e,t;Ai(e,t)}return null}function h(e,t,o,n){var a=null!==t?t.key:null;if("string"==typeof o||"number"==typeof o)return null!==a?null:c(e,t,""+o,n);if("object"==typeof o&&null!==o){switch(o.$$typeof){case k:return o.key===a?o.type===A?u(e,t,o.props.children,n,a):m(e,t,o,n):null;case C:return o.key===a?l(e,t,o,n):null}if(ki(o)||G(o))return null!==a?null:u(e,t,o,n,null);Ai(e,o)}return null}function p(e,t,o,n,a){if("string"==typeof n||"number"==typeof n)return c(t,e=e.get(o)||null,""+n,a);if("object"==typeof n&&null!==n){switch(n.$$typeof){case k:return e=e.get(null===n.key?o:n.key)||null,n.type===A?u(t,e,n.props.children,a,n.key):m(t,e,n,a);case C:return l(t,e=e.get(null===n.key?o:n.key)||null,n,a)}if(ki(n)||G(n))return u(t,e=e.get(o)||null,n,a,null);Ai(t,n)}return null}function g(a,r,s,c){for(var m=null,l=null,u=r,g=r=0,f=null;null!==u&&g<s.length;g++){u.index>g?(f=u,u=null):f=u.sibling;var b=h(a,u,s[g],c);if(null===b){null===u&&(u=f);break}e&&u&&null===b.alternate&&t(a,u),r=i(b,r,g),null===l?m=b:l.sibling=b,l=b,u=f}if(g===s.length)return o(a,u),m;if(null===u){for(;g<s.length;g++)null!==(u=d(a,s[g],c))&&(r=i(u,r,g),null===l?m=u:l.sibling=u,l=u);return m}for(u=n(a,u);g<s.length;g++)null!==(f=p(u,a,g,s[g],c))&&(e&&null!==f.alternate&&u.delete(null===f.key?g:f.key),r=i(f,r,g),null===l?m=f:l.sibling=f,l=f);return e&&u.forEach((function(e){return t(a,e)})),m}function f(a,s,c,m){var l=G(c);if("function"!=typeof l)throw Error(r(150));if(null==(c=l.call(c)))throw Error(r(151));for(var u=l=null,g=s,f=s=0,b=null,v=c.next();null!==g&&!v.done;f++,v=c.next()){g.index>f?(b=g,g=null):b=g.sibling;var w=h(a,g,v.value,m);if(null===w){null===g&&(g=b);break}e&&g&&null===w.alternate&&t(a,g),s=i(w,s,f),null===u?l=w:u.sibling=w,u=w,g=b}if(v.done)return o(a,g),l;if(null===g){for(;!v.done;f++,v=c.next())null!==(v=d(a,v.value,m))&&(s=i(v,s,f),null===u?l=v:u.sibling=v,u=v);return l}for(g=n(a,g);!v.done;f++,v=c.next())null!==(v=p(g,a,f,v.value,m))&&(e&&null!==v.alternate&&g.delete(null===v.key?f:v.key),s=i(v,s,f),null===u?l=v:u.sibling=v,u=v);return e&&g.forEach((function(e){return t(a,e)})),l}return function(e,n,i,c){var m="object"==typeof i&&null!==i&&i.type===A&&null===i.key;m&&(i=i.props.children);var l="object"==typeof i&&null!==i;if(l)switch(i.$$typeof){case k:e:{for(l=i.key,m=n;null!==m;){if(m.key===l){switch(m.tag){case 7:if(i.type===A){o(e,m.sibling),(n=a(m,i.props.children)).return=e,e=n;break e}break;default:if(m.elementType===i.type){o(e,m.sibling),(n=a(m,i.props)).ref=Ci(e,m,i),n.return=e,e=n;break e}}o(e,m);break}t(e,m),m=m.sibling}i.type===A?((n=Ec(i.props.children,e.mode,c,i.key)).return=e,e=n):((c=Dc(i.type,i.key,i.props,null,e.mode,c)).ref=Ci(e,n,i),c.return=e,e=c)}return s(e);case C:e:{for(m=i.key;null!==n;){if(n.key===m){if(4===n.tag&&n.stateNode.containerInfo===i.containerInfo&&n.stateNode.implementation===i.implementation){o(e,n.sibling),(n=a(n,i.children||[])).return=e,e=n;break e}o(e,n);break}t(e,n),n=n.sibling}(n=qc(i,e.mode,c)).return=e,e=n}return s(e)}if("string"==typeof i||"number"==typeof i)return i=""+i,null!==n&&6===n.tag?(o(e,n.sibling),(n=a(n,i)).return=e,e=n):(o(e,n),(n=Tc(i,e.mode,c)).return=e,e=n),s(e);if(ki(i))return g(e,n,i,c);if(G(i))return f(e,n,i,c);if(l&&Ai(e,i),void 0===i&&!m)switch(e.tag){case 1:case 0:throw e=e.type,Error(r(152,e.displayName||e.name||"Component"))}return o(e,n)}}var Mi=xi(!0),_i=xi(!1),Di={},Ei={current:Di},Ti={current:Di},qi={current:Di};function Si(e){if(e===Di)throw Error(r(174));return e}function zi(e,t){switch(la(qi,t),la(Ti,e),la(Ei,Di),e=t.nodeType){case 9:case 11:t=(t=t.documentElement)?t.namespaceURI:je(null,"");break;default:t=je(t=(e=8===e?t.parentNode:t).namespaceURI||null,e=e.tagName)}ma(Ei),la(Ei,t)}function Vi(){ma(Ei),ma(Ti),ma(qi)}function Bi(e){Si(qi.current);var t=Si(Ei.current),o=je(t,e.type);t!==o&&(la(Ti,e),la(Ei,o))}function Ri(e){Ti.current===e&&(ma(Ei),ma(Ti))}var Gi={current:0};function ji(e){for(var t=e;null!==t;){if(13===t.tag){var o=t.memoizedState;if(null!==o&&(null===(o=o.dehydrated)||"$?"===o.data||"$!"===o.data))return t}else if(19===t.tag&&void 0!==t.memoizedProps.revealOrder){if(0!=(64&t.effectTag))return t}else if(null!==t.child){t.child.return=t,t=t.child;continue}if(t===e)break;for(;null===t.sibling;){if(null===t.return||t.return===e)return null;t=t.return}t.sibling.return=t.return,t=t.sibling}return null}function Fi(e,t){return{responder:e,props:t}}var Hi=v.ReactCurrentDispatcher,Ni=v.ReactCurrentBatchConfig,Ii=0,Pi=null,Oi=null,Li=null,Ui=!1;function Wi(){throw Error(r(321))}function $i(e,t){if(null===t)return!1;for(var o=0;o<t.length&&o<e.length;o++)if(!Fn(e[o],t[o]))return!1;return!0}function Qi(e,t,o,n,a,i){if(Ii=i,Pi=t,t.memoizedState=null,t.updateQueue=null,t.expirationTime=0,Hi.current=null===e||null===e.memoizedState?br:vr,e=o(n,a),t.expirationTime===Ii){i=0;do{if(t.expirationTime=0,!(25>i))throw Error(r(301));i+=1,Li=Oi=null,t.updateQueue=null,Hi.current=wr,e=o(n,a)}while(t.expirationTime===Ii)}if(Hi.current=fr,t=null!==Oi&&null!==Oi.next,Ii=0,Li=Oi=Pi=null,Ui=!1,t)throw Error(r(300));return e}function Ki(){var e={memoizedState:null,baseState:null,baseQueue:null,queue:null,next:null};return null===Li?Pi.memoizedState=Li=e:Li=Li.next=e,Li}function Ji(){if(null===Oi){var e=Pi.alternate;e=null!==e?e.memoizedState:null}else e=Oi.next;var t=null===Li?Pi.memoizedState:Li.next;if(null!==t)Li=t,Oi=e;else{if(null===e)throw Error(r(310));e={memoizedState:(Oi=e).memoizedState,baseState:Oi.baseState,baseQueue:Oi.baseQueue,queue:Oi.queue,next:null},null===Li?Pi.memoizedState=Li=e:Li=Li.next=e}return Li}function Yi(e,t){return"function"==typeof t?t(e):t}function Zi(e){var t=Ji(),o=t.queue;if(null===o)throw Error(r(311));o.lastRenderedReducer=e;var n=Oi,a=n.baseQueue,i=o.pending;if(null!==i){if(null!==a){var s=a.next;a.next=i.next,i.next=s}n.baseQueue=a=i,o.pending=null}if(null!==a){a=a.next,n=n.baseState;var c=s=i=null,m=a;do{var l=m.expirationTime;if(l<Ii){var u={expirationTime:m.expirationTime,suspenseConfig:m.suspenseConfig,action:m.action,eagerReducer:m.eagerReducer,eagerState:m.eagerState,next:null};null===c?(s=c=u,i=n):c=c.next=u,l>Pi.expirationTime&&(Pi.expirationTime=l,rc(l))}else null!==c&&(c=c.next={expirationTime:1073741823,suspenseConfig:m.suspenseConfig,action:m.action,eagerReducer:m.eagerReducer,eagerState:m.eagerState,next:null}),ic(l,m.suspenseConfig),n=m.eagerReducer===e?m.eagerState:e(n,m.action);m=m.next}while(null!==m&&m!==a);null===c?i=n:c.next=s,Fn(n,t.memoizedState)||(qr=!0),t.memoizedState=n,t.baseState=i,t.baseQueue=c,o.lastRenderedState=n}return[t.memoizedState,o.dispatch]}function Xi(e){var t=Ji(),o=t.queue;if(null===o)throw Error(r(311));o.lastRenderedReducer=e;var n=o.dispatch,a=o.pending,i=t.memoizedState;if(null!==a){o.pending=null;var s=a=a.next;do{i=e(i,s.action),s=s.next}while(s!==a);Fn(i,t.memoizedState)||(qr=!0),t.memoizedState=i,null===t.baseQueue&&(t.baseState=i),o.lastRenderedState=i}return[i,n]}function er(e){var t=Ki();return"function"==typeof e&&(e=e()),t.memoizedState=t.baseState=e,e=(e=t.queue={pending:null,dispatch:null,lastRenderedReducer:Yi,lastRenderedState:e}).dispatch=gr.bind(null,Pi,e),[t.memoizedState,e]}function tr(e,t,o,n){return e={tag:e,create:t,destroy:o,deps:n,next:null},null===(t=Pi.updateQueue)?(t={lastEffect:null},Pi.updateQueue=t,t.lastEffect=e.next=e):null===(o=t.lastEffect)?t.lastEffect=e.next=e:(n=o.next,o.next=e,e.next=n,t.lastEffect=e),e}function or(){return Ji().memoizedState}function nr(e,t,o,n){var a=Ki();Pi.effectTag|=e,a.memoizedState=tr(1|t,o,void 0,void 0===n?null:n)}function ar(e,t,o,n){var a=Ji();n=void 0===n?null:n;var i=void 0;if(null!==Oi){var r=Oi.memoizedState;if(i=r.destroy,null!==n&&$i(n,r.deps))return void tr(t,o,i,n)}Pi.effectTag|=e,a.memoizedState=tr(1|t,o,i,n)}function ir(e,t){return nr(516,4,e,t)}function rr(e,t){return ar(516,4,e,t)}function sr(e,t){return ar(4,2,e,t)}function cr(e,t){return"function"==typeof t?(e=e(),t(e),function(){t(null)}):null!=t?(e=e(),t.current=e,function(){t.current=null}):void 0}function mr(e,t,o){return o=null!=o?o.concat([e]):null,ar(4,2,cr.bind(null,t,e),o)}function lr(){}function ur(e,t){return Ki().memoizedState=[e,void 0===t?null:t],e}function dr(e,t){var o=Ji();t=void 0===t?null:t;var n=o.memoizedState;return null!==n&&null!==t&&$i(t,n[1])?n[0]:(o.memoizedState=[e,t],e)}function hr(e,t){var o=Ji();t=void 0===t?null:t;var n=o.memoizedState;return null!==n&&null!==t&&$i(t,n[1])?n[0]:(e=e(),o.memoizedState=[e,t],e)}function pr(e,t,o){var n=Ia();Oa(98>n?98:n,(function(){e(!0)})),Oa(97<n?97:n,(function(){var n=Ni.suspense;Ni.suspense=void 0===t?null:t;try{e(!1),o()}finally{Ni.suspense=n}}))}function gr(e,t,o){var n=Ws(),a=hi.suspense;a={expirationTime:n=$s(n,e,a),suspenseConfig:a,action:o,eagerReducer:null,eagerState:null,next:null};var i=t.pending;if(null===i?a.next=a:(a.next=i.next,i.next=a),t.pending=a,i=e.alternate,e===Pi||null!==i&&i===Pi)Ui=!0,a.expirationTime=Ii,Pi.expirationTime=Ii;else{if(0===e.expirationTime&&(null===i||0===i.expirationTime)&&null!==(i=t.lastRenderedReducer))try{var r=t.lastRenderedState,s=i(r,o);if(a.eagerReducer=i,a.eagerState=s,Fn(s,r))return}catch(e){}Qs(e,n)}}var fr={readContext:ai,useCallback:Wi,useContext:Wi,useEffect:Wi,useImperativeHandle:Wi,useLayoutEffect:Wi,useMemo:Wi,useReducer:Wi,useRef:Wi,useState:Wi,useDebugValue:Wi,useResponder:Wi,useDeferredValue:Wi,useTransition:Wi},br={readContext:ai,useCallback:ur,useContext:ai,useEffect:ir,useImperativeHandle:function(e,t,o){return o=null!=o?o.concat([e]):null,nr(4,2,cr.bind(null,t,e),o)},useLayoutEffect:function(e,t){return nr(4,2,e,t)},useMemo:function(e,t){var o=Ki();return t=void 0===t?null:t,e=e(),o.memoizedState=[e,t],e},useReducer:function(e,t,o){var n=Ki();return t=void 0!==o?o(t):t,n.memoizedState=n.baseState=t,e=(e=n.queue={pending:null,dispatch:null,lastRenderedReducer:e,lastRenderedState:t}).dispatch=gr.bind(null,Pi,e),[n.memoizedState,e]},useRef:function(e){return e={current:e},Ki().memoizedState=e},useState:er,useDebugValue:lr,useResponder:Fi,useDeferredValue:function(e,t){var o=er(e),n=o[0],a=o[1];return ir((function(){var o=Ni.suspense;Ni.suspense=void 0===t?null:t;try{a(e)}finally{Ni.suspense=o}}),[e,t]),n},useTransition:function(e){var t=er(!1),o=t[0];return t=t[1],[ur(pr.bind(null,t,e),[t,e]),o]}},vr={readContext:ai,useCallback:dr,useContext:ai,useEffect:rr,useImperativeHandle:mr,useLayoutEffect:sr,useMemo:hr,useReducer:Zi,useRef:or,useState:function(){return Zi(Yi)},useDebugValue:lr,useResponder:Fi,useDeferredValue:function(e,t){var o=Zi(Yi),n=o[0],a=o[1];return rr((function(){var o=Ni.suspense;Ni.suspense=void 0===t?null:t;try{a(e)}finally{Ni.suspense=o}}),[e,t]),n},useTransition:function(e){var t=Zi(Yi),o=t[0];return t=t[1],[dr(pr.bind(null,t,e),[t,e]),o]}},wr={readContext:ai,useCallback:dr,useContext:ai,useEffect:rr,useImperativeHandle:mr,useLayoutEffect:sr,useMemo:hr,useReducer:Xi,useRef:or,useState:function(){return Xi(Yi)},useDebugValue:lr,useResponder:Fi,useDeferredValue:function(e,t){var o=Xi(Yi),n=o[0],a=o[1];return rr((function(){var o=Ni.suspense;Ni.suspense=void 0===t?null:t;try{a(e)}finally{Ni.suspense=o}}),[e,t]),n},useTransition:function(e){var t=Xi(Yi),o=t[0];return t=t[1],[dr(pr.bind(null,t,e),[t,e]),o]}},yr=null,kr=null,Cr=!1;function Ar(e,t){var o=xc(5,null,null,0);o.elementType="DELETED",o.type="DELETED",o.stateNode=t,o.return=e,o.effectTag=8,null!==e.lastEffect?(e.lastEffect.nextEffect=o,e.lastEffect=o):e.firstEffect=e.lastEffect=o}function xr(e,t){switch(e.tag){case 5:var o=e.type;return null!==(t=1!==t.nodeType||o.toLowerCase()!==t.nodeName.toLowerCase()?null:t)&&(e.stateNode=t,!0);case 6:return null!==(t=""===e.pendingProps||3!==t.nodeType?null:t)&&(e.stateNode=t,!0);case 13:default:return!1}}function Mr(e){if(Cr){var t=kr;if(t){var o=t;if(!xr(e,t)){if(!(t=ko(o.nextSibling))||!xr(e,t))return e.effectTag=-1025&e.effectTag|2,Cr=!1,void(yr=e);Ar(yr,o)}yr=e,kr=ko(t.firstChild)}else e.effectTag=-1025&e.effectTag|2,Cr=!1,yr=e}}function _r(e){for(e=e.return;null!==e&&5!==e.tag&&3!==e.tag&&13!==e.tag;)e=e.return;yr=e}function Dr(e){if(e!==yr)return!1;if(!Cr)return _r(e),Cr=!0,!1;var t=e.type;if(5!==e.tag||"head"!==t&&"body"!==t&&!vo(t,e.memoizedProps))for(t=kr;t;)Ar(e,t),t=ko(t.nextSibling);if(_r(e),13===e.tag){if(!(e=null!==(e=e.memoizedState)?e.dehydrated:null))throw Error(r(317));e:{for(e=e.nextSibling,t=0;e;){if(8===e.nodeType){var o=e.data;if("/$"===o){if(0===t){kr=ko(e.nextSibling);break e}t--}else"$"!==o&&"$!"!==o&&"$?"!==o||t++}e=e.nextSibling}kr=null}}else kr=yr?ko(e.stateNode.nextSibling):null;return!0}function Er(){kr=yr=null,Cr=!1}var Tr=v.ReactCurrentOwner,qr=!1;function Sr(e,t,o,n){t.child=null===e?_i(t,null,o,n):Mi(t,e.child,o,n)}function zr(e,t,o,n,a){o=o.render;var i=t.ref;return ni(t,a),n=Qi(e,t,o,n,i,a),null===e||qr?(t.effectTag|=1,Sr(e,t,n,a),t.child):(t.updateQueue=e.updateQueue,t.effectTag&=-517,e.expirationTime<=a&&(e.expirationTime=0),Qr(e,t,a))}function Vr(e,t,o,n,a,i){if(null===e){var r=o.type;return"function"!=typeof r||Mc(r)||void 0!==r.defaultProps||null!==o.compare||void 0!==o.defaultProps?((e=Dc(o.type,null,n,null,t.mode,i)).ref=t.ref,e.return=t,t.child=e):(t.tag=15,t.type=r,Br(e,t,r,n,a,i))}return r=e.child,a<i&&(a=r.memoizedProps,(o=null!==(o=o.compare)?o:Nn)(a,n)&&e.ref===t.ref)?Qr(e,t,i):(t.effectTag|=1,(e=_c(r,n)).ref=t.ref,e.return=t,t.child=e)}function Br(e,t,o,n,a,i){return null!==e&&Nn(e.memoizedProps,n)&&e.ref===t.ref&&(qr=!1,a<i)?(t.expirationTime=e.expirationTime,Qr(e,t,i)):Gr(e,t,o,n,i)}function Rr(e,t){var o=t.ref;(null===e&&null!==o||null!==e&&e.ref!==o)&&(t.effectTag|=128)}function Gr(e,t,o,n,a){var i=fa(o)?pa:da.current;return i=ga(t,i),ni(t,a),o=Qi(e,t,o,n,i,a),null===e||qr?(t.effectTag|=1,Sr(e,t,o,a),t.child):(t.updateQueue=e.updateQueue,t.effectTag&=-517,e.expirationTime<=a&&(e.expirationTime=0),Qr(e,t,a))}function jr(e,t,o,n,a){if(fa(o)){var i=!0;ya(t)}else i=!1;if(ni(t,a),null===t.stateNode)null!==e&&(e.alternate=null,t.alternate=null,t.effectTag|=2),vi(t,o,n),yi(t,o,n,a),n=!0;else if(null===e){var r=t.stateNode,s=t.memoizedProps;r.props=s;var c=r.context,m=o.contextType;"object"==typeof m&&null!==m?m=ai(m):m=ga(t,m=fa(o)?pa:da.current);var l=o.getDerivedStateFromProps,u="function"==typeof l||"function"==typeof r.getSnapshotBeforeUpdate;u||"function"!=typeof r.UNSAFE_componentWillReceiveProps&&"function"!=typeof r.componentWillReceiveProps||(s!==n||c!==m)&&wi(t,r,n,m),ii=!1;var d=t.memoizedState;r.state=d,ui(t,n,r,a),c=t.memoizedState,s!==n||d!==c||ha.current||ii?("function"==typeof l&&(gi(t,o,l,n),c=t.memoizedState),(s=ii||bi(t,o,s,n,d,c,m))?(u||"function"!=typeof r.UNSAFE_componentWillMount&&"function"!=typeof r.componentWillMount||("function"==typeof r.componentWillMount&&r.componentWillMount(),"function"==typeof r.UNSAFE_componentWillMount&&r.UNSAFE_componentWillMount()),"function"==typeof r.componentDidMount&&(t.effectTag|=4)):("function"==typeof r.componentDidMount&&(t.effectTag|=4),t.memoizedProps=n,t.memoizedState=c),r.props=n,r.state=c,r.context=m,n=s):("function"==typeof r.componentDidMount&&(t.effectTag|=4),n=!1)}else r=t.stateNode,si(e,t),s=t.memoizedProps,r.props=t.type===t.elementType?s:Ka(t.type,s),c=r.context,"object"==typeof(m=o.contextType)&&null!==m?m=ai(m):m=ga(t,m=fa(o)?pa:da.current),(u="function"==typeof(l=o.getDerivedStateFromProps)||"function"==typeof r.getSnapshotBeforeUpdate)||"function"!=typeof r.UNSAFE_componentWillReceiveProps&&"function"!=typeof r.componentWillReceiveProps||(s!==n||c!==m)&&wi(t,r,n,m),ii=!1,c=t.memoizedState,r.state=c,ui(t,n,r,a),d=t.memoizedState,s!==n||c!==d||ha.current||ii?("function"==typeof l&&(gi(t,o,l,n),d=t.memoizedState),(l=ii||bi(t,o,s,n,c,d,m))?(u||"function"!=typeof r.UNSAFE_componentWillUpdate&&"function"!=typeof r.componentWillUpdate||("function"==typeof r.componentWillUpdate&&r.componentWillUpdate(n,d,m),"function"==typeof r.UNSAFE_componentWillUpdate&&r.UNSAFE_componentWillUpdate(n,d,m)),"function"==typeof r.componentDidUpdate&&(t.effectTag|=4),"function"==typeof r.getSnapshotBeforeUpdate&&(t.effectTag|=256)):("function"!=typeof r.componentDidUpdate||s===e.memoizedProps&&c===e.memoizedState||(t.effectTag|=4),"function"!=typeof r.getSnapshotBeforeUpdate||s===e.memoizedProps&&c===e.memoizedState||(t.effectTag|=256),t.memoizedProps=n,t.memoizedState=d),r.props=n,r.state=d,r.context=m,n=l):("function"!=typeof r.componentDidUpdate||s===e.memoizedProps&&c===e.memoizedState||(t.effectTag|=4),"function"!=typeof r.getSnapshotBeforeUpdate||s===e.memoizedProps&&c===e.memoizedState||(t.effectTag|=256),n=!1);return Fr(e,t,o,n,i,a)}function Fr(e,t,o,n,a,i){Rr(e,t);var r=0!=(64&t.effectTag);if(!n&&!r)return a&&ka(t,o,!1),Qr(e,t,i);n=t.stateNode,Tr.current=t;var s=r&&"function"!=typeof o.getDerivedStateFromError?null:n.render();return t.effectTag|=1,null!==e&&r?(t.child=Mi(t,e.child,null,i),t.child=Mi(t,null,s,i)):Sr(e,t,s,i),t.memoizedState=n.state,a&&ka(t,o,!0),t.child}function Hr(e){var t=e.stateNode;t.pendingContext?va(0,t.pendingContext,t.pendingContext!==t.context):t.context&&va(0,t.context,!1),zi(e,t.containerInfo)}var Nr,Ir,Pr,Or={dehydrated:null,retryTime:0};function Lr(e,t,o){var n,a=t.mode,i=t.pendingProps,r=Gi.current,s=!1;if((n=0!=(64&t.effectTag))||(n=0!=(2&r)&&(null===e||null!==e.memoizedState)),n?(s=!0,t.effectTag&=-65):null!==e&&null===e.memoizedState||void 0===i.fallback||!0===i.unstable_avoidThisFallback||(r|=1),la(Gi,1&r),null===e){if(void 0!==i.fallback&&Mr(t),s){if(s=i.fallback,(i=Ec(null,a,0,null)).return=t,0==(2&t.mode))for(e=null!==t.memoizedState?t.child.child:t.child,i.child=e;null!==e;)e.return=i,e=e.sibling;return(o=Ec(s,a,o,null)).return=t,i.sibling=o,t.memoizedState=Or,t.child=i,o}return a=i.children,t.memoizedState=null,t.child=_i(t,null,a,o)}if(null!==e.memoizedState){if(a=(e=e.child).sibling,s){if(i=i.fallback,(o=_c(e,e.pendingProps)).return=t,0==(2&t.mode)&&(s=null!==t.memoizedState?t.child.child:t.child)!==e.child)for(o.child=s;null!==s;)s.return=o,s=s.sibling;return(a=_c(a,i)).return=t,o.sibling=a,o.childExpirationTime=0,t.memoizedState=Or,t.child=o,a}return o=Mi(t,e.child,i.children,o),t.memoizedState=null,t.child=o}if(e=e.child,s){if(s=i.fallback,(i=Ec(null,a,0,null)).return=t,i.child=e,null!==e&&(e.return=i),0==(2&t.mode))for(e=null!==t.memoizedState?t.child.child:t.child,i.child=e;null!==e;)e.return=i,e=e.sibling;return(o=Ec(s,a,o,null)).return=t,i.sibling=o,o.effectTag|=2,i.childExpirationTime=0,t.memoizedState=Or,t.child=i,o}return t.memoizedState=null,t.child=Mi(t,e,i.children,o)}function Ur(e,t){e.expirationTime<t&&(e.expirationTime=t);var o=e.alternate;null!==o&&o.expirationTime<t&&(o.expirationTime=t),oi(e.return,t)}function Wr(e,t,o,n,a,i){var r=e.memoizedState;null===r?e.memoizedState={isBackwards:t,rendering:null,renderingStartTime:0,last:n,tail:o,tailExpiration:0,tailMode:a,lastEffect:i}:(r.isBackwards=t,r.rendering=null,r.renderingStartTime=0,r.last=n,r.tail=o,r.tailExpiration=0,r.tailMode=a,r.lastEffect=i)}function $r(e,t,o){var n=t.pendingProps,a=n.revealOrder,i=n.tail;if(Sr(e,t,n.children,o),0!=(2&(n=Gi.current)))n=1&n|2,t.effectTag|=64;else{if(null!==e&&0!=(64&e.effectTag))e:for(e=t.child;null!==e;){if(13===e.tag)null!==e.memoizedState&&Ur(e,o);else if(19===e.tag)Ur(e,o);else if(null!==e.child){e.child.return=e,e=e.child;continue}if(e===t)break e;for(;null===e.sibling;){if(null===e.return||e.return===t)break e;e=e.return}e.sibling.return=e.return,e=e.sibling}n&=1}if(la(Gi,n),0==(2&t.mode))t.memoizedState=null;else switch(a){case"forwards":for(o=t.child,a=null;null!==o;)null!==(e=o.alternate)&&null===ji(e)&&(a=o),o=o.sibling;null===(o=a)?(a=t.child,t.child=null):(a=o.sibling,o.sibling=null),Wr(t,!1,a,o,i,t.lastEffect);break;case"backwards":for(o=null,a=t.child,t.child=null;null!==a;){if(null!==(e=a.alternate)&&null===ji(e)){t.child=a;break}e=a.sibling,a.sibling=o,o=a,a=e}Wr(t,!0,o,null,i,t.lastEffect);break;case"together":Wr(t,!1,null,null,void 0,t.lastEffect);break;default:t.memoizedState=null}return t.child}function Qr(e,t,o){null!==e&&(t.dependencies=e.dependencies);var n=t.expirationTime;if(0!==n&&rc(n),t.childExpirationTime<o)return null;if(null!==e&&t.child!==e.child)throw Error(r(153));if(null!==t.child){for(o=_c(e=t.child,e.pendingProps),t.child=o,o.return=t;null!==e.sibling;)e=e.sibling,(o=o.sibling=_c(e,e.pendingProps)).return=t;o.sibling=null}return t.child}function Kr(e,t){switch(e.tailMode){case"hidden":t=e.tail;for(var o=null;null!==t;)null!==t.alternate&&(o=t),t=t.sibling;null===o?e.tail=null:o.sibling=null;break;case"collapsed":o=e.tail;for(var n=null;null!==o;)null!==o.alternate&&(n=o),o=o.sibling;null===n?t||null===e.tail?e.tail=null:e.tail.sibling=null:n.sibling=null}}function Jr(e,t,o){var n=t.pendingProps;switch(t.tag){case 2:case 16:case 15:case 0:case 11:case 7:case 8:case 12:case 9:case 14:return null;case 1:return fa(t.type)&&ba(),null;case 3:return Vi(),ma(ha),ma(da),(o=t.stateNode).pendingContext&&(o.context=o.pendingContext,o.pendingContext=null),null!==e&&null!==e.child||!Dr(t)||(t.effectTag|=4),null;case 5:Ri(t),o=Si(qi.current);var i=t.type;if(null!==e&&null!=t.stateNode)Ir(e,t,i,n,o),e.ref!==t.ref&&(t.effectTag|=128);else{if(!n){if(null===t.stateNode)throw Error(r(166));return null}if(e=Si(Ei.current),Dr(t)){n=t.stateNode,i=t.type;var s=t.memoizedProps;switch(n[xo]=t,n[Mo]=s,i){case"iframe":case"object":case"embed":$t("load",n);break;case"video":case"audio":for(e=0;e<Je.length;e++)$t(Je[e],n);break;case"source":$t("error",n);break;case"img":case"image":case"link":$t("error",n),$t("load",n);break;case"form":$t("reset",n),$t("submit",n);break;case"details":$t("toggle",n);break;case"input":Ae(n,s),$t("invalid",n),so(o,"onChange");break;case"select":n._wrapperState={wasMultiple:!!s.multiple},$t("invalid",n),so(o,"onChange");break;case"textarea":Se(n,s),$t("invalid",n),so(o,"onChange")}for(var c in ao(i,s),e=null,s)if(s.hasOwnProperty(c)){var m=s[c];"children"===c?"string"==typeof m?n.textContent!==m&&(e=["children",m]):"number"==typeof m&&n.textContent!==""+m&&(e=["children",""+m]):U.hasOwnProperty(c)&&null!=m&&so(o,c)}switch(i){case"input":ye(n),_e(n,s,!0);break;case"textarea":ye(n),Ve(n);break;case"select":case"option":break;default:"function"==typeof s.onClick&&(n.onclick=co)}o=e,t.updateQueue=o,null!==o&&(t.effectTag|=4)}else{switch(c=9===o.nodeType?o:o.ownerDocument,e===ro&&(e=Ge(i)),e===ro?"script"===i?((e=c.createElement("div")).innerHTML="<script><\/script>",e=e.removeChild(e.firstChild)):"string"==typeof n.is?e=c.createElement(i,{is:n.is}):(e=c.createElement(i),"select"===i&&(c=e,n.multiple?c.multiple=!0:n.size&&(c.size=n.size))):e=c.createElementNS(e,i),e[xo]=t,e[Mo]=n,Nr(e,t),t.stateNode=e,c=io(i,n),i){case"iframe":case"object":case"embed":$t("load",e),m=n;break;case"video":case"audio":for(m=0;m<Je.length;m++)$t(Je[m],e);m=n;break;case"source":$t("error",e),m=n;break;case"img":case"image":case"link":$t("error",e),$t("load",e),m=n;break;case"form":$t("reset",e),$t("submit",e),m=n;break;case"details":$t("toggle",e),m=n;break;case"input":Ae(e,n),m=Ce(e,n),$t("invalid",e),so(o,"onChange");break;case"option":m=Ee(e,n);break;case"select":e._wrapperState={wasMultiple:!!n.multiple},m=a({},n,{value:void 0}),$t("invalid",e),so(o,"onChange");break;case"textarea":Se(e,n),m=qe(e,n),$t("invalid",e),so(o,"onChange");break;default:m=n}ao(i,m);var l=m;for(s in l)if(l.hasOwnProperty(s)){var u=l[s];"style"===s?oo(e,u):"dangerouslySetInnerHTML"===s?null!=(u=u?u.__html:void 0)&&He(e,u):"children"===s?"string"==typeof u?("textarea"!==i||""!==u)&&Ne(e,u):"number"==typeof u&&Ne(e,""+u):"suppressContentEditableWarning"!==s&&"suppressHydrationWarning"!==s&&"autoFocus"!==s&&(U.hasOwnProperty(s)?null!=u&&so(o,s):null!=u&&be(e,s,u,c))}switch(i){case"input":ye(e),_e(e,n,!1);break;case"textarea":ye(e),Ve(e);break;case"option":null!=n.value&&e.setAttribute("value",""+ve(n.value));break;case"select":e.multiple=!!n.multiple,null!=(o=n.value)?Te(e,!!n.multiple,o,!1):null!=n.defaultValue&&Te(e,!!n.multiple,n.defaultValue,!0);break;default:"function"==typeof m.onClick&&(e.onclick=co)}bo(i,n)&&(t.effectTag|=4)}null!==t.ref&&(t.effectTag|=128)}return null;case 6:if(e&&null!=t.stateNode)Pr(0,t,e.memoizedProps,n);else{if("string"!=typeof n&&null===t.stateNode)throw Error(r(166));o=Si(qi.current),Si(Ei.current),Dr(t)?(o=t.stateNode,n=t.memoizedProps,o[xo]=t,o.nodeValue!==n&&(t.effectTag|=4)):((o=(9===o.nodeType?o:o.ownerDocument).createTextNode(n))[xo]=t,t.stateNode=o)}return null;case 13:return ma(Gi),n=t.memoizedState,0!=(64&t.effectTag)?(t.expirationTime=o,t):(o=null!==n,n=!1,null===e?void 0!==t.memoizedProps.fallback&&Dr(t):(n=null!==(i=e.memoizedState),o||null===i||null!==(i=e.child.sibling)&&(null!==(s=t.firstEffect)?(t.firstEffect=i,i.nextEffect=s):(t.firstEffect=t.lastEffect=i,i.nextEffect=null),i.effectTag=8)),o&&!n&&0!=(2&t.mode)&&(null===e&&!0!==t.memoizedProps.unstable_avoidThisFallback||0!=(1&Gi.current)?Ds===ys&&(Ds=ks):(Ds!==ys&&Ds!==ks||(Ds=Cs),0!==zs&&null!==xs&&(Vc(xs,_s),Bc(xs,zs)))),(o||n)&&(t.effectTag|=4),null);case 4:return Vi(),null;case 10:return ti(t),null;case 17:return fa(t.type)&&ba(),null;case 19:if(ma(Gi),null===(n=t.memoizedState))return null;if(i=0!=(64&t.effectTag),null===(s=n.rendering)){if(i)Kr(n,!1);else if(Ds!==ys||null!==e&&0!=(64&e.effectTag))for(s=t.child;null!==s;){if(null!==(e=ji(s))){for(t.effectTag|=64,Kr(n,!1),null!==(i=e.updateQueue)&&(t.updateQueue=i,t.effectTag|=4),null===n.lastEffect&&(t.firstEffect=null),t.lastEffect=n.lastEffect,n=t.child;null!==n;)s=o,(i=n).effectTag&=2,i.nextEffect=null,i.firstEffect=null,i.lastEffect=null,null===(e=i.alternate)?(i.childExpirationTime=0,i.expirationTime=s,i.child=null,i.memoizedProps=null,i.memoizedState=null,i.updateQueue=null,i.dependencies=null):(i.childExpirationTime=e.childExpirationTime,i.expirationTime=e.expirationTime,i.child=e.child,i.memoizedProps=e.memoizedProps,i.memoizedState=e.memoizedState,i.updateQueue=e.updateQueue,s=e.dependencies,i.dependencies=null===s?null:{expirationTime:s.expirationTime,firstContext:s.firstContext,responders:s.responders}),n=n.sibling;return la(Gi,1&Gi.current|2),t.child}s=s.sibling}}else{if(!i)if(null!==(e=ji(s))){if(t.effectTag|=64,i=!0,null!==(o=e.updateQueue)&&(t.updateQueue=o,t.effectTag|=4),Kr(n,!0),null===n.tail&&"hidden"===n.tailMode&&!s.alternate)return null!==(t=t.lastEffect=n.lastEffect)&&(t.nextEffect=null),null}else 2*Na()-n.renderingStartTime>n.tailExpiration&&1<o&&(t.effectTag|=64,i=!0,Kr(n,!1),t.expirationTime=t.childExpirationTime=o-1);n.isBackwards?(s.sibling=t.child,t.child=s):(null!==(o=n.last)?o.sibling=s:t.child=s,n.last=s)}return null!==n.tail?(0===n.tailExpiration&&(n.tailExpiration=Na()+500),o=n.tail,n.rendering=o,n.tail=o.sibling,n.lastEffect=t.lastEffect,n.renderingStartTime=Na(),o.sibling=null,t=Gi.current,la(Gi,i?1&t|2:1&t),o):null}throw Error(r(156,t.tag))}function Yr(e){switch(e.tag){case 1:fa(e.type)&&ba();var t=e.effectTag;return 4096&t?(e.effectTag=-4097&t|64,e):null;case 3:if(Vi(),ma(ha),ma(da),0!=(64&(t=e.effectTag)))throw Error(r(285));return e.effectTag=-4097&t|64,e;case 5:return Ri(e),null;case 13:return ma(Gi),4096&(t=e.effectTag)?(e.effectTag=-4097&t|64,e):null;case 19:return ma(Gi),null;case 4:return Vi(),null;case 10:return ti(e),null;default:return null}}function Zr(e,t){return{value:e,source:t,stack:F(t)}}Nr=function(e,t){for(var o=t.child;null!==o;){if(5===o.tag||6===o.tag)e.appendChild(o.stateNode);else if(4!==o.tag&&null!==o.child){o.child.return=o,o=o.child;continue}if(o===t)break;for(;null===o.sibling;){if(null===o.return||o.return===t)return;o=o.return}o.sibling.return=o.return,o=o.sibling}},Ir=function(e,t,o,n,i){var r=e.memoizedProps;if(r!==n){var s,c,m=t.stateNode;switch(Si(Ei.current),e=null,o){case"input":r=Ce(m,r),n=Ce(m,n),e=[];break;case"option":r=Ee(m,r),n=Ee(m,n),e=[];break;case"select":r=a({},r,{value:void 0}),n=a({},n,{value:void 0}),e=[];break;case"textarea":r=qe(m,r),n=qe(m,n),e=[];break;default:"function"!=typeof r.onClick&&"function"==typeof n.onClick&&(m.onclick=co)}for(s in ao(o,n),o=null,r)if(!n.hasOwnProperty(s)&&r.hasOwnProperty(s)&&null!=r[s])if("style"===s)for(c in m=r[s])m.hasOwnProperty(c)&&(o||(o={}),o[c]="");else"dangerouslySetInnerHTML"!==s&&"children"!==s&&"suppressContentEditableWarning"!==s&&"suppressHydrationWarning"!==s&&"autoFocus"!==s&&(U.hasOwnProperty(s)?e||(e=[]):(e=e||[]).push(s,null));for(s in n){var l=n[s];if(m=null!=r?r[s]:void 0,n.hasOwnProperty(s)&&l!==m&&(null!=l||null!=m))if("style"===s)if(m){for(c in m)!m.hasOwnProperty(c)||l&&l.hasOwnProperty(c)||(o||(o={}),o[c]="");for(c in l)l.hasOwnProperty(c)&&m[c]!==l[c]&&(o||(o={}),o[c]=l[c])}else o||(e||(e=[]),e.push(s,o)),o=l;else"dangerouslySetInnerHTML"===s?(l=l?l.__html:void 0,m=m?m.__html:void 0,null!=l&&m!==l&&(e=e||[]).push(s,l)):"children"===s?m===l||"string"!=typeof l&&"number"!=typeof l||(e=e||[]).push(s,""+l):"suppressContentEditableWarning"!==s&&"suppressHydrationWarning"!==s&&(U.hasOwnProperty(s)?(null!=l&&so(i,s),e||m===l||(e=[])):(e=e||[]).push(s,l))}o&&(e=e||[]).push("style",o),i=e,(t.updateQueue=i)&&(t.effectTag|=4)}},Pr=function(e,t,o,n){o!==n&&(t.effectTag|=4)};var Xr="function"==typeof WeakSet?WeakSet:Set;function es(e,t){var o=t.source,n=t.stack;null===n&&null!==o&&(n=F(o)),null!==o&&j(o.type),t=t.value,null!==e&&1===e.tag&&j(e.type);try{console.error(t)}catch(e){setTimeout((function(){throw e}))}}function ts(e){var t=e.ref;if(null!==t)if("function"==typeof t)try{t(null)}catch(t){vc(e,t)}else t.current=null}function os(e,t){switch(t.tag){case 0:case 11:case 15:case 22:return;case 1:if(256&t.effectTag&&null!==e){var o=e.memoizedProps,n=e.memoizedState;t=(e=t.stateNode).getSnapshotBeforeUpdate(t.elementType===t.type?o:Ka(t.type,o),n),e.__reactInternalSnapshotBeforeUpdate=t}return;case 3:case 5:case 6:case 4:case 17:return}throw Error(r(163))}function ns(e,t){if(null!==(t=null!==(t=t.updateQueue)?t.lastEffect:null)){var o=t=t.next;do{if((o.tag&e)===e){var n=o.destroy;o.destroy=void 0,void 0!==n&&n()}o=o.next}while(o!==t)}}function as(e,t){if(null!==(t=null!==(t=t.updateQueue)?t.lastEffect:null)){var o=t=t.next;do{if((o.tag&e)===e){var n=o.create;o.destroy=n()}o=o.next}while(o!==t)}}function is(e,t,o){switch(o.tag){case 0:case 11:case 15:case 22:return void as(3,o);case 1:if(e=o.stateNode,4&o.effectTag)if(null===t)e.componentDidMount();else{var n=o.elementType===o.type?t.memoizedProps:Ka(o.type,t.memoizedProps);e.componentDidUpdate(n,t.memoizedState,e.__reactInternalSnapshotBeforeUpdate)}return void(null!==(t=o.updateQueue)&&di(o,t,e));case 3:if(null!==(t=o.updateQueue)){if(e=null,null!==o.child)switch(o.child.tag){case 5:e=o.child.stateNode;break;case 1:e=o.child.stateNode}di(o,t,e)}return;case 5:return e=o.stateNode,void(null===t&&4&o.effectTag&&bo(o.type,o.memoizedProps)&&e.focus());case 6:case 4:case 12:return;case 13:return void(null===o.memoizedState&&(o=o.alternate,null!==o&&(o=o.memoizedState,null!==o&&(o=o.dehydrated,null!==o&&Gt(o)))));case 19:case 17:case 20:case 21:return}throw Error(r(163))}function rs(e,t,o){switch("function"==typeof Cc&&Cc(t),t.tag){case 0:case 11:case 14:case 15:case 22:if(null!==(e=t.updateQueue)&&null!==(e=e.lastEffect)){var n=e.next;Oa(97<o?97:o,(function(){var e=n;do{var o=e.destroy;if(void 0!==o){var a=t;try{o()}catch(e){vc(a,e)}}e=e.next}while(e!==n)}))}break;case 1:ts(t),"function"==typeof(o=t.stateNode).componentWillUnmount&&function(e,t){try{t.props=e.memoizedProps,t.state=e.memoizedState,t.componentWillUnmount()}catch(t){vc(e,t)}}(t,o);break;case 5:ts(t);break;case 4:ls(e,t,o)}}function ss(e){var t=e.alternate;e.return=null,e.child=null,e.memoizedState=null,e.updateQueue=null,e.dependencies=null,e.alternate=null,e.firstEffect=null,e.lastEffect=null,e.pendingProps=null,e.memoizedProps=null,e.stateNode=null,null!==t&&ss(t)}function cs(e){return 5===e.tag||3===e.tag||4===e.tag}function ms(e){e:{for(var t=e.return;null!==t;){if(cs(t)){var o=t;break e}t=t.return}throw Error(r(160))}switch(t=o.stateNode,o.tag){case 5:var n=!1;break;case 3:case 4:t=t.containerInfo,n=!0;break;default:throw Error(r(161))}16&o.effectTag&&(Ne(t,""),o.effectTag&=-17);e:t:for(o=e;;){for(;null===o.sibling;){if(null===o.return||cs(o.return)){o=null;break e}o=o.return}for(o.sibling.return=o.return,o=o.sibling;5!==o.tag&&6!==o.tag&&18!==o.tag;){if(2&o.effectTag)continue t;if(null===o.child||4===o.tag)continue t;o.child.return=o,o=o.child}if(!(2&o.effectTag)){o=o.stateNode;break e}}n?function e(t,o,n){var a=t.tag,i=5===a||6===a;if(i)t=i?t.stateNode:t.stateNode.instance,o?8===n.nodeType?n.parentNode.insertBefore(t,o):n.insertBefore(t,o):(8===n.nodeType?(o=n.parentNode).insertBefore(t,n):(o=n).appendChild(t),null!==(n=n._reactRootContainer)&&void 0!==n||null!==o.onclick||(o.onclick=co));else if(4!==a&&null!==(t=t.child))for(e(t,o,n),t=t.sibling;null!==t;)e(t,o,n),t=t.sibling}(e,o,t):function e(t,o,n){var a=t.tag,i=5===a||6===a;if(i)t=i?t.stateNode:t.stateNode.instance,o?n.insertBefore(t,o):n.appendChild(t);else if(4!==a&&null!==(t=t.child))for(e(t,o,n),t=t.sibling;null!==t;)e(t,o,n),t=t.sibling}(e,o,t)}function ls(e,t,o){for(var n,a,i=t,s=!1;;){if(!s){s=i.return;e:for(;;){if(null===s)throw Error(r(160));switch(n=s.stateNode,s.tag){case 5:a=!1;break e;case 3:case 4:n=n.containerInfo,a=!0;break e}s=s.return}s=!0}if(5===i.tag||6===i.tag){e:for(var c=e,m=i,l=o,u=m;;)if(rs(c,u,l),null!==u.child&&4!==u.tag)u.child.return=u,u=u.child;else{if(u===m)break e;for(;null===u.sibling;){if(null===u.return||u.return===m)break e;u=u.return}u.sibling.return=u.return,u=u.sibling}a?(c=n,m=i.stateNode,8===c.nodeType?c.parentNode.removeChild(m):c.removeChild(m)):n.removeChild(i.stateNode)}else if(4===i.tag){if(null!==i.child){n=i.stateNode.containerInfo,a=!0,i.child.return=i,i=i.child;continue}}else if(rs(e,i,o),null!==i.child){i.child.return=i,i=i.child;continue}if(i===t)break;for(;null===i.sibling;){if(null===i.return||i.return===t)return;4===(i=i.return).tag&&(s=!1)}i.sibling.return=i.return,i=i.sibling}}function us(e,t){switch(t.tag){case 0:case 11:case 14:case 15:case 22:return void ns(3,t);case 1:return;case 5:var o=t.stateNode;if(null!=o){var n=t.memoizedProps,a=null!==e?e.memoizedProps:n;e=t.type;var i=t.updateQueue;if(t.updateQueue=null,null!==i){for(o[Mo]=n,"input"===e&&"radio"===n.type&&null!=n.name&&xe(o,n),io(e,a),t=io(e,n),a=0;a<i.length;a+=2){var s=i[a],c=i[a+1];"style"===s?oo(o,c):"dangerouslySetInnerHTML"===s?He(o,c):"children"===s?Ne(o,c):be(o,s,c,t)}switch(e){case"input":Me(o,n);break;case"textarea":ze(o,n);break;case"select":t=o._wrapperState.wasMultiple,o._wrapperState.wasMultiple=!!n.multiple,null!=(e=n.value)?Te(o,!!n.multiple,e,!1):t!==!!n.multiple&&(null!=n.defaultValue?Te(o,!!n.multiple,n.defaultValue,!0):Te(o,!!n.multiple,n.multiple?[]:"",!1))}}}return;case 6:if(null===t.stateNode)throw Error(r(162));return void(t.stateNode.nodeValue=t.memoizedProps);case 3:return void((t=t.stateNode).hydrate&&(t.hydrate=!1,Gt(t.containerInfo)));case 12:return;case 13:if(o=t,null===t.memoizedState?n=!1:(n=!0,o=t.child,Bs=Na()),null!==o)e:for(e=o;;){if(5===e.tag)i=e.stateNode,n?"function"==typeof(i=i.style).setProperty?i.setProperty("display","none","important"):i.display="none":(i=e.stateNode,a=null!=(a=e.memoizedProps.style)&&a.hasOwnProperty("display")?a.display:null,i.style.display=to("display",a));else if(6===e.tag)e.stateNode.nodeValue=n?"":e.memoizedProps;else{if(13===e.tag&&null!==e.memoizedState&&null===e.memoizedState.dehydrated){(i=e.child.sibling).return=e,e=i;continue}if(null!==e.child){e.child.return=e,e=e.child;continue}}if(e===o)break;for(;null===e.sibling;){if(null===e.return||e.return===o)break e;e=e.return}e.sibling.return=e.return,e=e.sibling}return void ds(t);case 19:return void ds(t);case 17:return}throw Error(r(163))}function ds(e){var t=e.updateQueue;if(null!==t){e.updateQueue=null;var o=e.stateNode;null===o&&(o=e.stateNode=new Xr),t.forEach((function(t){var n=yc.bind(null,e,t);o.has(t)||(o.add(t),t.then(n,n))}))}}var hs="function"==typeof WeakMap?WeakMap:Map;function ps(e,t,o){(o=ci(o,null)).tag=3,o.payload={element:null};var n=t.value;return o.callback=function(){Gs||(Gs=!0,js=n),es(e,t)},o}function gs(e,t,o){(o=ci(o,null)).tag=3;var n=e.type.getDerivedStateFromError;if("function"==typeof n){var a=t.value;o.payload=function(){return es(e,t),n(a)}}var i=e.stateNode;return null!==i&&"function"==typeof i.componentDidCatch&&(o.callback=function(){"function"!=typeof n&&(null===Fs?Fs=new Set([this]):Fs.add(this),es(e,t));var o=t.stack;this.componentDidCatch(t.value,{componentStack:null!==o?o:""})}),o}var fs,bs=Math.ceil,vs=v.ReactCurrentDispatcher,ws=v.ReactCurrentOwner,ys=0,ks=3,Cs=4,As=0,xs=null,Ms=null,_s=0,Ds=ys,Es=null,Ts=1073741823,qs=1073741823,Ss=null,zs=0,Vs=!1,Bs=0,Rs=null,Gs=!1,js=null,Fs=null,Hs=!1,Ns=null,Is=90,Ps=null,Os=0,Ls=null,Us=0;function Ws(){return 0!=(48&As)?1073741821-(Na()/10|0):0!==Us?Us:Us=1073741821-(Na()/10|0)}function $s(e,t,o){if(0==(2&(t=t.mode)))return 1073741823;var n=Ia();if(0==(4&t))return 99===n?1073741823:1073741822;if(0!=(16&As))return _s;if(null!==o)e=Qa(e,0|o.timeoutMs||5e3,250);else switch(n){case 99:e=1073741823;break;case 98:e=Qa(e,150,100);break;case 97:case 96:e=Qa(e,5e3,250);break;case 95:e=2;break;default:throw Error(r(326))}return null!==xs&&e===_s&&--e,e}function Qs(e,t){if(50<Os)throw Os=0,Ls=null,Error(r(185));if(null!==(e=Ks(e,t))){var o=Ia();1073741823===t?0!=(8&As)&&0==(48&As)?Xs(e):(Ys(e),0===As&&Wa()):Ys(e),0==(4&As)||98!==o&&99!==o||(null===Ps?Ps=new Map([[e,t]]):(void 0===(o=Ps.get(e))||o>t)&&Ps.set(e,t))}}function Ks(e,t){e.expirationTime<t&&(e.expirationTime=t);var o=e.alternate;null!==o&&o.expirationTime<t&&(o.expirationTime=t);var n=e.return,a=null;if(null===n&&3===e.tag)a=e.stateNode;else for(;null!==n;){if(o=n.alternate,n.childExpirationTime<t&&(n.childExpirationTime=t),null!==o&&o.childExpirationTime<t&&(o.childExpirationTime=t),null===n.return&&3===n.tag){a=n.stateNode;break}n=n.return}return null!==a&&(xs===a&&(rc(t),Ds===Cs&&Vc(a,_s)),Bc(a,t)),a}function Js(e){var t=e.lastExpiredTime;if(0!==t)return t;if(!zc(e,t=e.firstPendingTime))return t;var o=e.lastPingedTime;return 2>=(e=o>(e=e.nextKnownPendingLevel)?o:e)&&t!==e?0:e}function Ys(e){if(0!==e.lastExpiredTime)e.callbackExpirationTime=1073741823,e.callbackPriority=99,e.callbackNode=Ua(Xs.bind(null,e));else{var t=Js(e),o=e.callbackNode;if(0===t)null!==o&&(e.callbackNode=null,e.callbackExpirationTime=0,e.callbackPriority=90);else{var n=Ws();if(1073741823===t?n=99:1===t||2===t?n=95:n=0>=(n=10*(1073741821-t)-10*(1073741821-n))?99:250>=n?98:5250>=n?97:95,null!==o){var a=e.callbackPriority;if(e.callbackExpirationTime===t&&a>=n)return;o!==Va&&xa(o)}e.callbackExpirationTime=t,e.callbackPriority=n,t=1073741823===t?Ua(Xs.bind(null,e)):La(n,Zs.bind(null,e),{timeout:10*(1073741821-t)-Na()}),e.callbackNode=t}}}function Zs(e,t){if(Us=0,t)return Rc(e,t=Ws()),Ys(e),null;var o=Js(e);if(0!==o){if(t=e.callbackNode,0!=(48&As))throw Error(r(327));if(gc(),e===xs&&o===_s||oc(e,o),null!==Ms){var n=As;As|=16;for(var a=ac();;)try{cc();break}catch(t){nc(e,t)}if(ei(),As=n,vs.current=a,1===Ds)throw t=Es,oc(e,o),Vc(e,o),Ys(e),t;if(null===Ms)switch(a=e.finishedWork=e.current.alternate,e.finishedExpirationTime=o,n=Ds,xs=null,n){case ys:case 1:throw Error(r(345));case 2:Rc(e,2<o?2:o);break;case ks:if(Vc(e,o),o===(n=e.lastSuspendedTime)&&(e.nextKnownPendingLevel=uc(a)),1073741823===Ts&&10<(a=Bs+500-Na())){if(Vs){var i=e.lastPingedTime;if(0===i||i>=o){e.lastPingedTime=o,oc(e,o);break}}if(0!==(i=Js(e))&&i!==o)break;if(0!==n&&n!==o){e.lastPingedTime=n;break}e.timeoutHandle=wo(dc.bind(null,e),a);break}dc(e);break;case Cs:if(Vc(e,o),o===(n=e.lastSuspendedTime)&&(e.nextKnownPendingLevel=uc(a)),Vs&&(0===(a=e.lastPingedTime)||a>=o)){e.lastPingedTime=o,oc(e,o);break}if(0!==(a=Js(e))&&a!==o)break;if(0!==n&&n!==o){e.lastPingedTime=n;break}if(1073741823!==qs?n=10*(1073741821-qs)-Na():1073741823===Ts?n=0:(n=10*(1073741821-Ts)-5e3,0>(n=(a=Na())-n)&&(n=0),(o=10*(1073741821-o)-a)<(n=(120>n?120:480>n?480:1080>n?1080:1920>n?1920:3e3>n?3e3:4320>n?4320:1960*bs(n/1960))-n)&&(n=o)),10<n){e.timeoutHandle=wo(dc.bind(null,e),n);break}dc(e);break;case 5:if(1073741823!==Ts&&null!==Ss){i=Ts;var s=Ss;if(0>=(n=0|s.busyMinDurationMs)?n=0:(a=0|s.busyDelayMs,n=(i=Na()-(10*(1073741821-i)-(0|s.timeoutMs||5e3)))<=a?0:a+n-i),10<n){Vc(e,o),e.timeoutHandle=wo(dc.bind(null,e),n);break}}dc(e);break;default:throw Error(r(329))}if(Ys(e),e.callbackNode===t)return Zs.bind(null,e)}}return null}function Xs(e){var t=e.lastExpiredTime;if(t=0!==t?t:1073741823,0!=(48&As))throw Error(r(327));if(gc(),e===xs&&t===_s||oc(e,t),null!==Ms){var o=As;As|=16;for(var n=ac();;)try{sc();break}catch(t){nc(e,t)}if(ei(),As=o,vs.current=n,1===Ds)throw o=Es,oc(e,t),Vc(e,t),Ys(e),o;if(null!==Ms)throw Error(r(261));e.finishedWork=e.current.alternate,e.finishedExpirationTime=t,xs=null,dc(e),Ys(e)}return null}function ec(e,t){var o=As;As|=1;try{return e(t)}finally{0===(As=o)&&Wa()}}function tc(e,t){var o=As;As&=-2,As|=8;try{return e(t)}finally{0===(As=o)&&Wa()}}function oc(e,t){e.finishedWork=null,e.finishedExpirationTime=0;var o=e.timeoutHandle;if(-1!==o&&(e.timeoutHandle=-1,yo(o)),null!==Ms)for(o=Ms.return;null!==o;){var n=o;switch(n.tag){case 1:null!=(n=n.type.childContextTypes)&&ba();break;case 3:Vi(),ma(ha),ma(da);break;case 5:Ri(n);break;case 4:Vi();break;case 13:case 19:ma(Gi);break;case 10:ti(n)}o=o.return}xs=e,Ms=_c(e.current,null),_s=t,Ds=ys,Es=null,qs=Ts=1073741823,Ss=null,zs=0,Vs=!1}function nc(e,t){for(;;){try{if(ei(),Hi.current=fr,Ui)for(var o=Pi.memoizedState;null!==o;){var n=o.queue;null!==n&&(n.pending=null),o=o.next}if(Ii=0,Li=Oi=Pi=null,Ui=!1,null===Ms||null===Ms.return)return Ds=1,Es=t,Ms=null;e:{var a=e,i=Ms.return,r=Ms,s=t;if(t=_s,r.effectTag|=2048,r.firstEffect=r.lastEffect=null,null!==s&&"object"==typeof s&&"function"==typeof s.then){var c=s;if(0==(2&r.mode)){var m=r.alternate;m?(r.memoizedState=m.memoizedState,r.expirationTime=m.expirationTime):r.memoizedState=null}var l=0!=(1&Gi.current),u=i;do{var d;if(d=13===u.tag){var h=u.memoizedState;if(null!==h)d=null!==h.dehydrated;else{var p=u.memoizedProps;d=void 0!==p.fallback&&(!0!==p.unstable_avoidThisFallback||!l)}}if(d){var g=u.updateQueue;if(null===g){var f=new Set;f.add(c),u.updateQueue=f}else g.add(c);if(0==(2&u.mode)){if(u.effectTag|=64,r.effectTag&=-2981,1===r.tag)if(null===r.alternate)r.tag=17;else{var b=ci(1073741823,null);b.tag=2,mi(r,b)}r.expirationTime=1073741823;break e}s=void 0,r=t;var v=a.pingCache;if(null===v?(v=a.pingCache=new hs,s=new Set,v.set(c,s)):void 0===(s=v.get(c))&&(s=new Set,v.set(c,s)),!s.has(r)){s.add(r);var w=wc.bind(null,a,c,r);c.then(w,w)}u.effectTag|=4096,u.expirationTime=t;break e}u=u.return}while(null!==u);s=Error((j(r.type)||"A React component")+" suspended while rendering, but no fallback UI was specified.\n\nAdd a <Suspense fallback=...> component higher in the tree to provide a loading indicator or placeholder to display."+F(r))}5!==Ds&&(Ds=2),s=Zr(s,r),u=i;do{switch(u.tag){case 3:c=s,u.effectTag|=4096,u.expirationTime=t,li(u,ps(u,c,t));break e;case 1:c=s;var y=u.type,k=u.stateNode;if(0==(64&u.effectTag)&&("function"==typeof y.getDerivedStateFromError||null!==k&&"function"==typeof k.componentDidCatch&&(null===Fs||!Fs.has(k)))){u.effectTag|=4096,u.expirationTime=t,li(u,gs(u,c,t));break e}}u=u.return}while(null!==u)}Ms=lc(Ms)}catch(e){t=e;continue}break}}function ac(){var e=vs.current;return vs.current=fr,null===e?fr:e}function ic(e,t){e<Ts&&2<e&&(Ts=e),null!==t&&e<qs&&2<e&&(qs=e,Ss=t)}function rc(e){e>zs&&(zs=e)}function sc(){for(;null!==Ms;)Ms=mc(Ms)}function cc(){for(;null!==Ms&&!Ba();)Ms=mc(Ms)}function mc(e){var t=fs(e.alternate,e,_s);return e.memoizedProps=e.pendingProps,null===t&&(t=lc(e)),ws.current=null,t}function lc(e){Ms=e;do{var t=Ms.alternate;if(e=Ms.return,0==(2048&Ms.effectTag)){if(t=Jr(t,Ms,_s),1===_s||1!==Ms.childExpirationTime){for(var o=0,n=Ms.child;null!==n;){var a=n.expirationTime,i=n.childExpirationTime;a>o&&(o=a),i>o&&(o=i),n=n.sibling}Ms.childExpirationTime=o}if(null!==t)return t;null!==e&&0==(2048&e.effectTag)&&(null===e.firstEffect&&(e.firstEffect=Ms.firstEffect),null!==Ms.lastEffect&&(null!==e.lastEffect&&(e.lastEffect.nextEffect=Ms.firstEffect),e.lastEffect=Ms.lastEffect),1<Ms.effectTag&&(null!==e.lastEffect?e.lastEffect.nextEffect=Ms:e.firstEffect=Ms,e.lastEffect=Ms))}else{if(null!==(t=Yr(Ms)))return t.effectTag&=2047,t;null!==e&&(e.firstEffect=e.lastEffect=null,e.effectTag|=2048)}if(null!==(t=Ms.sibling))return t;Ms=e}while(null!==Ms);return Ds===ys&&(Ds=5),null}function uc(e){var t=e.expirationTime;return t>(e=e.childExpirationTime)?t:e}function dc(e){var t=Ia();return Oa(99,hc.bind(null,e,t)),null}function hc(e,t){do{gc()}while(null!==Ns);if(0!=(48&As))throw Error(r(327));var o=e.finishedWork,n=e.finishedExpirationTime;if(null===o)return null;if(e.finishedWork=null,e.finishedExpirationTime=0,o===e.current)throw Error(r(177));e.callbackNode=null,e.callbackExpirationTime=0,e.callbackPriority=90,e.nextKnownPendingLevel=0;var a=uc(o);if(e.firstPendingTime=a,n<=e.lastSuspendedTime?e.firstSuspendedTime=e.lastSuspendedTime=e.nextKnownPendingLevel=0:n<=e.firstSuspendedTime&&(e.firstSuspendedTime=n-1),n<=e.lastPingedTime&&(e.lastPingedTime=0),n<=e.lastExpiredTime&&(e.lastExpiredTime=0),e===xs&&(Ms=xs=null,_s=0),1<o.effectTag?null!==o.lastEffect?(o.lastEffect.nextEffect=o,a=o.firstEffect):a=o:a=o.firstEffect,null!==a){var i=As;As|=32,ws.current=null,go=Wt;var s=ho();if(po(s)){if("selectionStart"in s)var c={start:s.selectionStart,end:s.selectionEnd};else e:{var m=(c=(c=s.ownerDocument)&&c.defaultView||window).getSelection&&c.getSelection();if(m&&0!==m.rangeCount){c=m.anchorNode;var l=m.anchorOffset,u=m.focusNode;m=m.focusOffset;try{c.nodeType,u.nodeType}catch(e){c=null;break e}var d=0,h=-1,p=-1,g=0,f=0,b=s,v=null;t:for(;;){for(var w;b!==c||0!==l&&3!==b.nodeType||(h=d+l),b!==u||0!==m&&3!==b.nodeType||(p=d+m),3===b.nodeType&&(d+=b.nodeValue.length),null!==(w=b.firstChild);)v=b,b=w;for(;;){if(b===s)break t;if(v===c&&++g===l&&(h=d),v===u&&++f===m&&(p=d),null!==(w=b.nextSibling))break;v=(b=v).parentNode}b=w}c=-1===h||-1===p?null:{start:h,end:p}}else c=null}c=c||{start:0,end:0}}else c=null;fo={activeElementDetached:null,focusedElem:s,selectionRange:c},Wt=!1,Rs=a;do{try{pc()}catch(e){if(null===Rs)throw Error(r(330));vc(Rs,e),Rs=Rs.nextEffect}}while(null!==Rs);Rs=a;do{try{for(s=e,c=t;null!==Rs;){var y=Rs.effectTag;if(16&y&&Ne(Rs.stateNode,""),128&y){var k=Rs.alternate;if(null!==k){var C=k.ref;null!==C&&("function"==typeof C?C(null):C.current=null)}}switch(1038&y){case 2:ms(Rs),Rs.effectTag&=-3;break;case 6:ms(Rs),Rs.effectTag&=-3,us(Rs.alternate,Rs);break;case 1024:Rs.effectTag&=-1025;break;case 1028:Rs.effectTag&=-1025,us(Rs.alternate,Rs);break;case 4:us(Rs.alternate,Rs);break;case 8:ls(s,l=Rs,c),ss(l)}Rs=Rs.nextEffect}}catch(e){if(null===Rs)throw Error(r(330));vc(Rs,e),Rs=Rs.nextEffect}}while(null!==Rs);if(C=fo,k=ho(),y=C.focusedElem,c=C.selectionRange,k!==y&&y&&y.ownerDocument&&function e(t,o){return!(!t||!o)&&(t===o||(!t||3!==t.nodeType)&&(o&&3===o.nodeType?e(t,o.parentNode):"contains"in t?t.contains(o):!!t.compareDocumentPosition&&!!(16&t.compareDocumentPosition(o))))}(y.ownerDocument.documentElement,y)){null!==c&&po(y)&&(k=c.start,void 0===(C=c.end)&&(C=k),"selectionStart"in y?(y.selectionStart=k,y.selectionEnd=Math.min(C,y.value.length)):(C=(k=y.ownerDocument||document)&&k.defaultView||window).getSelection&&(C=C.getSelection(),l=y.textContent.length,s=Math.min(c.start,l),c=void 0===c.end?s:Math.min(c.end,l),!C.extend&&s>c&&(l=c,c=s,s=l),l=uo(y,s),u=uo(y,c),l&&u&&(1!==C.rangeCount||C.anchorNode!==l.node||C.anchorOffset!==l.offset||C.focusNode!==u.node||C.focusOffset!==u.offset)&&((k=k.createRange()).setStart(l.node,l.offset),C.removeAllRanges(),s>c?(C.addRange(k),C.extend(u.node,u.offset)):(k.setEnd(u.node,u.offset),C.addRange(k))))),k=[];for(C=y;C=C.parentNode;)1===C.nodeType&&k.push({element:C,left:C.scrollLeft,top:C.scrollTop});for("function"==typeof y.focus&&y.focus(),y=0;y<k.length;y++)(C=k[y]).element.scrollLeft=C.left,C.element.scrollTop=C.top}Wt=!!go,fo=go=null,e.current=o,Rs=a;do{try{for(y=e;null!==Rs;){var A=Rs.effectTag;if(36&A&&is(y,Rs.alternate,Rs),128&A){k=void 0;var x=Rs.ref;if(null!==x){var M=Rs.stateNode;switch(Rs.tag){case 5:k=M;break;default:k=M}"function"==typeof x?x(k):x.current=k}}Rs=Rs.nextEffect}}catch(e){if(null===Rs)throw Error(r(330));vc(Rs,e),Rs=Rs.nextEffect}}while(null!==Rs);Rs=null,Ra(),As=i}else e.current=o;if(Hs)Hs=!1,Ns=e,Is=t;else for(Rs=a;null!==Rs;)t=Rs.nextEffect,Rs.nextEffect=null,Rs=t;if(0===(t=e.firstPendingTime)&&(Fs=null),1073741823===t?e===Ls?Os++:(Os=0,Ls=e):Os=0,"function"==typeof kc&&kc(o.stateNode,n),Ys(e),Gs)throw Gs=!1,e=js,js=null,e;return 0!=(8&As)||Wa(),null}function pc(){for(;null!==Rs;){var e=Rs.effectTag;0!=(256&e)&&os(Rs.alternate,Rs),0==(512&e)||Hs||(Hs=!0,La(97,(function(){return gc(),null}))),Rs=Rs.nextEffect}}function gc(){if(90!==Is){var e=97<Is?97:Is;return Is=90,Oa(e,fc)}}function fc(){if(null===Ns)return!1;var e=Ns;if(Ns=null,0!=(48&As))throw Error(r(331));var t=As;for(As|=32,e=e.current.firstEffect;null!==e;){try{var o=e;if(0!=(512&o.effectTag))switch(o.tag){case 0:case 11:case 15:case 22:ns(5,o),as(5,o)}}catch(t){if(null===e)throw Error(r(330));vc(e,t)}o=e.nextEffect,e.nextEffect=null,e=o}return As=t,Wa(),!0}function bc(e,t,o){mi(e,t=ps(e,t=Zr(o,t),1073741823)),null!==(e=Ks(e,1073741823))&&Ys(e)}function vc(e,t){if(3===e.tag)bc(e,e,t);else for(var o=e.return;null!==o;){if(3===o.tag){bc(o,e,t);break}if(1===o.tag){var n=o.stateNode;if("function"==typeof o.type.getDerivedStateFromError||"function"==typeof n.componentDidCatch&&(null===Fs||!Fs.has(n))){mi(o,e=gs(o,e=Zr(t,e),1073741823)),null!==(o=Ks(o,1073741823))&&Ys(o);break}}o=o.return}}function wc(e,t,o){var n=e.pingCache;null!==n&&n.delete(t),xs===e&&_s===o?Ds===Cs||Ds===ks&&1073741823===Ts&&Na()-Bs<500?oc(e,_s):Vs=!0:zc(e,o)&&(0!==(t=e.lastPingedTime)&&t<o||(e.lastPingedTime=o,Ys(e)))}function yc(e,t){var o=e.stateNode;null!==o&&o.delete(t),0===(t=0)&&(t=$s(t=Ws(),e,null)),null!==(e=Ks(e,t))&&Ys(e)}fs=function(e,t,o){var n=t.expirationTime;if(null!==e){var a=t.pendingProps;if(e.memoizedProps!==a||ha.current)qr=!0;else{if(n<o){switch(qr=!1,t.tag){case 3:Hr(t),Er();break;case 5:if(Bi(t),4&t.mode&&1!==o&&a.hidden)return t.expirationTime=t.childExpirationTime=1,null;break;case 1:fa(t.type)&&ya(t);break;case 4:zi(t,t.stateNode.containerInfo);break;case 10:n=t.memoizedProps.value,a=t.type._context,la(Ja,a._currentValue),a._currentValue=n;break;case 13:if(null!==t.memoizedState)return 0!==(n=t.child.childExpirationTime)&&n>=o?Lr(e,t,o):(la(Gi,1&Gi.current),null!==(t=Qr(e,t,o))?t.sibling:null);la(Gi,1&Gi.current);break;case 19:if(n=t.childExpirationTime>=o,0!=(64&e.effectTag)){if(n)return $r(e,t,o);t.effectTag|=64}if(null!==(a=t.memoizedState)&&(a.rendering=null,a.tail=null),la(Gi,Gi.current),!n)return null}return Qr(e,t,o)}qr=!1}}else qr=!1;switch(t.expirationTime=0,t.tag){case 2:if(n=t.type,null!==e&&(e.alternate=null,t.alternate=null,t.effectTag|=2),e=t.pendingProps,a=ga(t,da.current),ni(t,o),a=Qi(null,t,n,e,a,o),t.effectTag|=1,"object"==typeof a&&null!==a&&"function"==typeof a.render&&void 0===a.$$typeof){if(t.tag=1,t.memoizedState=null,t.updateQueue=null,fa(n)){var i=!0;ya(t)}else i=!1;t.memoizedState=null!==a.state&&void 0!==a.state?a.state:null,ri(t);var s=n.getDerivedStateFromProps;"function"==typeof s&&gi(t,n,s,e),a.updater=fi,t.stateNode=a,a._reactInternalFiber=t,yi(t,n,e,o),t=Fr(null,t,n,!0,i,o)}else t.tag=0,Sr(null,t,a,o),t=t.child;return t;case 16:e:{if(a=t.elementType,null!==e&&(e.alternate=null,t.alternate=null,t.effectTag|=2),e=t.pendingProps,function(e){if(-1===e._status){e._status=0;var t=e._ctor;t=t(),e._result=t,t.then((function(t){0===e._status&&(t=t.default,e._status=1,e._result=t)}),(function(t){0===e._status&&(e._status=2,e._result=t)}))}}(a),1!==a._status)throw a._result;switch(a=a._result,t.type=a,i=t.tag=function(e){if("function"==typeof e)return Mc(e)?1:0;if(null!=e){if((e=e.$$typeof)===T)return 11;if(e===z)return 14}return 2}(a),e=Ka(a,e),i){case 0:t=Gr(null,t,a,e,o);break e;case 1:t=jr(null,t,a,e,o);break e;case 11:t=zr(null,t,a,e,o);break e;case 14:t=Vr(null,t,a,Ka(a.type,e),n,o);break e}throw Error(r(306,a,""))}return t;case 0:return n=t.type,a=t.pendingProps,Gr(e,t,n,a=t.elementType===n?a:Ka(n,a),o);case 1:return n=t.type,a=t.pendingProps,jr(e,t,n,a=t.elementType===n?a:Ka(n,a),o);case 3:if(Hr(t),n=t.updateQueue,null===e||null===n)throw Error(r(282));if(n=t.pendingProps,a=null!==(a=t.memoizedState)?a.element:null,si(e,t),ui(t,n,null,o),(n=t.memoizedState.element)===a)Er(),t=Qr(e,t,o);else{if((a=t.stateNode.hydrate)&&(kr=ko(t.stateNode.containerInfo.firstChild),yr=t,a=Cr=!0),a)for(o=_i(t,null,n,o),t.child=o;o;)o.effectTag=-3&o.effectTag|1024,o=o.sibling;else Sr(e,t,n,o),Er();t=t.child}return t;case 5:return Bi(t),null===e&&Mr(t),n=t.type,a=t.pendingProps,i=null!==e?e.memoizedProps:null,s=a.children,vo(n,a)?s=null:null!==i&&vo(n,i)&&(t.effectTag|=16),Rr(e,t),4&t.mode&&1!==o&&a.hidden?(t.expirationTime=t.childExpirationTime=1,t=null):(Sr(e,t,s,o),t=t.child),t;case 6:return null===e&&Mr(t),null;case 13:return Lr(e,t,o);case 4:return zi(t,t.stateNode.containerInfo),n=t.pendingProps,null===e?t.child=Mi(t,null,n,o):Sr(e,t,n,o),t.child;case 11:return n=t.type,a=t.pendingProps,zr(e,t,n,a=t.elementType===n?a:Ka(n,a),o);case 7:return Sr(e,t,t.pendingProps,o),t.child;case 8:case 12:return Sr(e,t,t.pendingProps.children,o),t.child;case 10:e:{n=t.type._context,a=t.pendingProps,s=t.memoizedProps,i=a.value;var c=t.type._context;if(la(Ja,c._currentValue),c._currentValue=i,null!==s)if(c=s.value,0===(i=Fn(c,i)?0:0|("function"==typeof n._calculateChangedBits?n._calculateChangedBits(c,i):1073741823))){if(s.children===a.children&&!ha.current){t=Qr(e,t,o);break e}}else for(null!==(c=t.child)&&(c.return=t);null!==c;){var m=c.dependencies;if(null!==m){s=c.child;for(var l=m.firstContext;null!==l;){if(l.context===n&&0!=(l.observedBits&i)){1===c.tag&&((l=ci(o,null)).tag=2,mi(c,l)),c.expirationTime<o&&(c.expirationTime=o),null!==(l=c.alternate)&&l.expirationTime<o&&(l.expirationTime=o),oi(c.return,o),m.expirationTime<o&&(m.expirationTime=o);break}l=l.next}}else s=10===c.tag&&c.type===t.type?null:c.child;if(null!==s)s.return=c;else for(s=c;null!==s;){if(s===t){s=null;break}if(null!==(c=s.sibling)){c.return=s.return,s=c;break}s=s.return}c=s}Sr(e,t,a.children,o),t=t.child}return t;case 9:return a=t.type,n=(i=t.pendingProps).children,ni(t,o),n=n(a=ai(a,i.unstable_observedBits)),t.effectTag|=1,Sr(e,t,n,o),t.child;case 14:return i=Ka(a=t.type,t.pendingProps),Vr(e,t,a,i=Ka(a.type,i),n,o);case 15:return Br(e,t,t.type,t.pendingProps,n,o);case 17:return n=t.type,a=t.pendingProps,a=t.elementType===n?a:Ka(n,a),null!==e&&(e.alternate=null,t.alternate=null,t.effectTag|=2),t.tag=1,fa(n)?(e=!0,ya(t)):e=!1,ni(t,o),vi(t,n,a),yi(t,n,a,o),Fr(null,t,n,!0,e,o);case 19:return $r(e,t,o)}throw Error(r(156,t.tag))};var kc=null,Cc=null;function Ac(e,t,o,n){this.tag=e,this.key=o,this.sibling=this.child=this.return=this.stateNode=this.type=this.elementType=null,this.index=0,this.ref=null,this.pendingProps=t,this.dependencies=this.memoizedState=this.updateQueue=this.memoizedProps=null,this.mode=n,this.effectTag=0,this.lastEffect=this.firstEffect=this.nextEffect=null,this.childExpirationTime=this.expirationTime=0,this.alternate=null}function xc(e,t,o,n){return new Ac(e,t,o,n)}function Mc(e){return!(!(e=e.prototype)||!e.isReactComponent)}function _c(e,t){var o=e.alternate;return null===o?((o=xc(e.tag,t,e.key,e.mode)).elementType=e.elementType,o.type=e.type,o.stateNode=e.stateNode,o.alternate=e,e.alternate=o):(o.pendingProps=t,o.effectTag=0,o.nextEffect=null,o.firstEffect=null,o.lastEffect=null),o.childExpirationTime=e.childExpirationTime,o.expirationTime=e.expirationTime,o.child=e.child,o.memoizedProps=e.memoizedProps,o.memoizedState=e.memoizedState,o.updateQueue=e.updateQueue,t=e.dependencies,o.dependencies=null===t?null:{expirationTime:t.expirationTime,firstContext:t.firstContext,responders:t.responders},o.sibling=e.sibling,o.index=e.index,o.ref=e.ref,o}function Dc(e,t,o,n,a,i){var s=2;if(n=e,"function"==typeof e)Mc(e)&&(s=1);else if("string"==typeof e)s=5;else e:switch(e){case A:return Ec(o.children,a,i,t);case E:s=8,a|=7;break;case x:s=8,a|=1;break;case M:return(e=xc(12,o,t,8|a)).elementType=M,e.type=M,e.expirationTime=i,e;case q:return(e=xc(13,o,t,a)).type=q,e.elementType=q,e.expirationTime=i,e;case S:return(e=xc(19,o,t,a)).elementType=S,e.expirationTime=i,e;default:if("object"==typeof e&&null!==e)switch(e.$$typeof){case _:s=10;break e;case D:s=9;break e;case T:s=11;break e;case z:s=14;break e;case V:s=16,n=null;break e;case B:s=22;break e}throw Error(r(130,null==e?e:typeof e,""))}return(t=xc(s,o,t,a)).elementType=e,t.type=n,t.expirationTime=i,t}function Ec(e,t,o,n){return(e=xc(7,e,n,t)).expirationTime=o,e}function Tc(e,t,o){return(e=xc(6,e,null,t)).expirationTime=o,e}function qc(e,t,o){return(t=xc(4,null!==e.children?e.children:[],e.key,t)).expirationTime=o,t.stateNode={containerInfo:e.containerInfo,pendingChildren:null,implementation:e.implementation},t}function Sc(e,t,o){this.tag=t,this.current=null,this.containerInfo=e,this.pingCache=this.pendingChildren=null,this.finishedExpirationTime=0,this.finishedWork=null,this.timeoutHandle=-1,this.pendingContext=this.context=null,this.hydrate=o,this.callbackNode=null,this.callbackPriority=90,this.lastExpiredTime=this.lastPingedTime=this.nextKnownPendingLevel=this.lastSuspendedTime=this.firstSuspendedTime=this.firstPendingTime=0}function zc(e,t){var o=e.firstSuspendedTime;return e=e.lastSuspendedTime,0!==o&&o>=t&&e<=t}function Vc(e,t){var o=e.firstSuspendedTime,n=e.lastSuspendedTime;o<t&&(e.firstSuspendedTime=t),(n>t||0===o)&&(e.lastSuspendedTime=t),t<=e.lastPingedTime&&(e.lastPingedTime=0),t<=e.lastExpiredTime&&(e.lastExpiredTime=0)}function Bc(e,t){t>e.firstPendingTime&&(e.firstPendingTime=t);var o=e.firstSuspendedTime;0!==o&&(t>=o?e.firstSuspendedTime=e.lastSuspendedTime=e.nextKnownPendingLevel=0:t>=e.lastSuspendedTime&&(e.lastSuspendedTime=t+1),t>e.nextKnownPendingLevel&&(e.nextKnownPendingLevel=t))}function Rc(e,t){var o=e.lastExpiredTime;(0===o||o>t)&&(e.lastExpiredTime=t)}function Gc(e,t,o,n){var a=t.current,i=Ws(),s=hi.suspense;i=$s(i,a,s);e:if(o){t:{if(Xe(o=o._reactInternalFiber)!==o||1!==o.tag)throw Error(r(170));var c=o;do{switch(c.tag){case 3:c=c.stateNode.context;break t;case 1:if(fa(c.type)){c=c.stateNode.__reactInternalMemoizedMergedChildContext;break t}}c=c.return}while(null!==c);throw Error(r(171))}if(1===o.tag){var m=o.type;if(fa(m)){o=wa(o,m,c);break e}}o=c}else o=ua;return null===t.context?t.context=o:t.pendingContext=o,(t=ci(i,s)).payload={element:e},null!==(n=void 0===n?null:n)&&(t.callback=n),mi(a,t),Qs(a,i),i}function jc(e){if(!(e=e.current).child)return null;switch(e.child.tag){case 5:default:return e.child.stateNode}}function Fc(e,t){null!==(e=e.memoizedState)&&null!==e.dehydrated&&e.retryTime<t&&(e.retryTime=t)}function Hc(e,t){Fc(e,t),(e=e.alternate)&&Fc(e,t)}function Nc(e,t,o){var n=new Sc(e,t,o=null!=o&&!0===o.hydrate),a=xc(3,null,null,2===t?7:1===t?3:0);n.current=a,a.stateNode=n,ri(a),e[_o]=n.current,o&&0!==t&&function(e,t){var o=Ze(t);_t.forEach((function(e){pt(e,t,o)})),Dt.forEach((function(e){pt(e,t,o)}))}(0,9===e.nodeType?e:e.ownerDocument),this._internalRoot=n}function Ic(e){return!(!e||1!==e.nodeType&&9!==e.nodeType&&11!==e.nodeType&&(8!==e.nodeType||" react-mount-point-unstable "!==e.nodeValue))}function Pc(e,t,o,n,a){var i=o._reactRootContainer;if(i){var r=i._internalRoot;if("function"==typeof a){var s=a;a=function(){var e=jc(r);s.call(e)}}Gc(t,r,e,a)}else{if(i=o._reactRootContainer=function(e,t){if(t||(t=!(!(t=e?9===e.nodeType?e.documentElement:e.firstChild:null)||1!==t.nodeType||!t.hasAttribute("data-reactroot"))),!t)for(var o;o=e.lastChild;)e.removeChild(o);return new Nc(e,0,t?{hydrate:!0}:void 0)}(o,n),r=i._internalRoot,"function"==typeof a){var c=a;a=function(){var e=jc(r);c.call(e)}}tc((function(){Gc(t,r,e,a)}))}return jc(r)}function Oc(e,t,o){var n=3<arguments.length&&void 0!==arguments[3]?arguments[3]:null;return{$$typeof:C,key:null==n?null:""+n,children:e,containerInfo:t,implementation:o}}function Lc(e,t){var o=2<arguments.length&&void 0!==arguments[2]?arguments[2]:null;if(!Ic(t))throw Error(r(200));return Oc(e,t,null,o)}Nc.prototype.render=function(e){Gc(e,this._internalRoot,null,null)},Nc.prototype.unmount=function(){var e=this._internalRoot,t=e.containerInfo;Gc(null,e,null,(function(){t[_o]=null}))},gt=function(e){if(13===e.tag){var t=Qa(Ws(),150,100);Qs(e,t),Hc(e,t)}},ft=function(e){13===e.tag&&(Qs(e,3),Hc(e,3))},bt=function(e){if(13===e.tag){var t=Ws();Qs(e,t=$s(t,e,null)),Hc(e,t)}},K=function(e,t,o){switch(t){case"input":if(Me(e,o),t=o.name,"radio"===o.type&&null!=t){for(o=e;o.parentNode;)o=o.parentNode;for(o=o.querySelectorAll("input[name="+JSON.stringify(""+t)+'][type="radio"]'),t=0;t<o.length;t++){var n=o[t];if(n!==e&&n.form===e.form){var a=qo(n);if(!a)throw Error(r(90));ke(n),Me(n,a)}}}break;case"textarea":ze(e,o);break;case"select":null!=(t=o.value)&&Te(e,!!o.multiple,t,!1)}},te=ec,oe=function(e,t,o,n,a){var i=As;As|=4;try{return Oa(98,e.bind(null,t,o,n,a))}finally{0===(As=i)&&Wa()}},ne=function(){0==(49&As)&&(function(){if(null!==Ps){var e=Ps;Ps=null,e.forEach((function(e,t){Rc(t,e),Ys(t)})),Wa()}}(),gc())},ae=function(e,t){var o=As;As|=2;try{return e(t)}finally{0===(As=o)&&Wa()}};var Uc={Events:[Eo,To,qo,$,L,jo,function(e){at(e,Go)},X,ee,Yt,st,gc,{current:!1}]};!function(e){var t=e.findFiberByHostInstance;(function(e){if("undefined"==typeof __REACT_DEVTOOLS_GLOBAL_HOOK__)return!1;var t=__REACT_DEVTOOLS_GLOBAL_HOOK__;if(t.isDisabled||!t.supportsFiber)return!0;try{var o=t.inject(e);kc=function(e){try{t.onCommitFiberRoot(o,e,void 0,64==(64&e.current.effectTag))}catch(e){}},Cc=function(e){try{t.onCommitFiberUnmount(o,e)}catch(e){}}}catch(e){}})(a({},e,{overrideHookState:null,overrideProps:null,setSuspenseHandler:null,scheduleUpdate:null,currentDispatcherRef:v.ReactCurrentDispatcher,findHostInstanceByFiber:function(e){return null===(e=ot(e))?null:e.stateNode},findFiberByHostInstance:function(e){return t?t(e):null},findHostInstancesForRefresh:null,scheduleRefresh:null,scheduleRoot:null,setRefreshHandler:null,getCurrentFiber:null}))}({findFiberByHostInstance:Do,bundleType:0,version:"16.13.0",rendererPackageName:"react-dom"}),o.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED=Uc,o.createPortal=Lc,o.findDOMNode=function(e){if(null==e)return null;if(1===e.nodeType)return e;var t=e._reactInternalFiber;if(void 0===t){if("function"==typeof e.render)throw Error(r(188));throw Error(r(268,Object.keys(e)))}return e=null===(e=ot(t))?null:e.stateNode},o.flushSync=function(e,t){if(0!=(48&As))throw Error(r(187));var o=As;As|=1;try{return Oa(99,e.bind(null,t))}finally{As=o,Wa()}},o.hydrate=function(e,t,o){if(!Ic(t))throw Error(r(200));return Pc(null,e,t,!0,o)},o.render=function(e,t,o){if(!Ic(t))throw Error(r(200));return Pc(null,e,t,!1,o)},o.unmountComponentAtNode=function(e){if(!Ic(e))throw Error(r(40));return!!e._reactRootContainer&&(tc((function(){Pc(null,null,e,!1,(function(){e._reactRootContainer=null,e[_o]=null}))})),!0)},o.unstable_batchedUpdates=ec,o.unstable_createPortal=function(e,t){return Lc(e,t,2<arguments.length&&void 0!==arguments[2]?arguments[2]:null)},o.unstable_renderSubtreeIntoContainer=function(e,t,o,n){if(!Ic(o))throw Error(r(200));if(null==e||void 0===e._reactInternalFiber)throw Error(r(38));return Pc(e,t,o,!1,n)},o.version="16.13.0"},{"object-assign":11,react:28,scheduler:33}],22:[function(e,t,o){"use strict";!function e(){if("undefined"!=typeof __REACT_DEVTOOLS_GLOBAL_HOOK__&&"function"==typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.checkDCE){0;try{__REACT_DEVTOOLS_GLOBAL_HOOK__.checkDCE(e)}catch(e){console.error(e)}}}(),t.exports=e("./cjs/react-dom.production.min.js")},{"./cjs/react-dom.development.js":20,"./cjs/react-dom.production.min.js":21}],23:[function(e,t,o){(function(e){
/** @license React v16.13.0
 * react-is.development.js
 *
 * Copyright (c) Facebook, Inc. and its affiliates.
 *
 * This source code is licensed under the MIT license found in the
 * LICENSE file in the root directory of this source tree.
 */
"use strict";"production"!==e.env.NODE_ENV&&function(){var e="function"==typeof Symbol&&Symbol.for,t=e?Symbol.for("react.element"):60103,n=e?Symbol.for("react.portal"):60106,a=e?Symbol.for("react.fragment"):60107,i=e?Symbol.for("react.strict_mode"):60108,r=e?Symbol.for("react.profiler"):60114,s=e?Symbol.for("react.provider"):60109,c=e?Symbol.for("react.context"):60110,m=e?Symbol.for("react.async_mode"):60111,l=e?Symbol.for("react.concurrent_mode"):60111,u=e?Symbol.for("react.forward_ref"):60112,d=e?Symbol.for("react.suspense"):60113,h=e?Symbol.for("react.suspense_list"):60120,p=e?Symbol.for("react.memo"):60115,g=e?Symbol.for("react.lazy"):60116,f=e?Symbol.for("react.block"):60121,b=e?Symbol.for("react.fundamental"):60117,v=e?Symbol.for("react.responder"):60118,w=e?Symbol.for("react.scope"):60119;function y(e){if("object"==typeof e&&null!==e){var o=e.$$typeof;switch(o){case t:var h=e.type;switch(h){case m:case l:case a:case r:case i:case d:return h;default:var f=h&&h.$$typeof;switch(f){case c:case u:case g:case p:case s:return f;default:return o}}case n:return o}}}var k=m,C=l,A=c,x=s,M=t,_=u,D=a,E=g,T=p,q=n,S=r,z=i,V=d,B=!1;function R(e){return y(e)===l}o.AsyncMode=k,o.ConcurrentMode=C,o.ContextConsumer=A,o.ContextProvider=x,o.Element=M,o.ForwardRef=_,o.Fragment=D,o.Lazy=E,o.Memo=T,o.Portal=q,o.Profiler=S,o.StrictMode=z,o.Suspense=V,o.isAsyncMode=function(e){return B||(B=!0,console.warn("The ReactIs.isAsyncMode() alias has been deprecated, and will be removed in React 17+. Update your code to use ReactIs.isConcurrentMode() instead. It has the exact same API.")),R(e)||y(e)===m},o.isConcurrentMode=R,o.isContextConsumer=function(e){return y(e)===c},o.isContextProvider=function(e){return y(e)===s},o.isElement=function(e){return"object"==typeof e&&null!==e&&e.$$typeof===t},o.isForwardRef=function(e){return y(e)===u},o.isFragment=function(e){return y(e)===a},o.isLazy=function(e){return y(e)===g},o.isMemo=function(e){return y(e)===p},o.isPortal=function(e){return y(e)===n},o.isProfiler=function(e){return y(e)===r},o.isStrictMode=function(e){return y(e)===i},o.isSuspense=function(e){return y(e)===d},o.isValidElementType=function(e){return"string"==typeof e||"function"==typeof e||e===a||e===l||e===r||e===i||e===d||e===h||"object"==typeof e&&null!==e&&(e.$$typeof===g||e.$$typeof===p||e.$$typeof===s||e.$$typeof===c||e.$$typeof===u||e.$$typeof===b||e.$$typeof===v||e.$$typeof===w||e.$$typeof===f)},o.typeOf=y}()}).call(this,e("_process"))},{_process:13}],24:[function(e,t,o){
/** @license React v16.13.0
 * react-is.production.min.js
 *
 * Copyright (c) Facebook, Inc. and its affiliates.
 *
 * This source code is licensed under the MIT license found in the
 * LICENSE file in the root directory of this source tree.
 */
"use strict";var n="function"==typeof Symbol&&Symbol.for,a=n?Symbol.for("react.element"):60103,i=n?Symbol.for("react.portal"):60106,r=n?Symbol.for("react.fragment"):60107,s=n?Symbol.for("react.strict_mode"):60108,c=n?Symbol.for("react.profiler"):60114,m=n?Symbol.for("react.provider"):60109,l=n?Symbol.for("react.context"):60110,u=n?Symbol.for("react.async_mode"):60111,d=n?Symbol.for("react.concurrent_mode"):60111,h=n?Symbol.for("react.forward_ref"):60112,p=n?Symbol.for("react.suspense"):60113,g=n?Symbol.for("react.suspense_list"):60120,f=n?Symbol.for("react.memo"):60115,b=n?Symbol.for("react.lazy"):60116,v=n?Symbol.for("react.block"):60121,w=n?Symbol.for("react.fundamental"):60117,y=n?Symbol.for("react.responder"):60118,k=n?Symbol.for("react.scope"):60119;function C(e){if("object"==typeof e&&null!==e){var t=e.$$typeof;switch(t){case a:switch(e=e.type){case u:case d:case r:case c:case s:case p:return e;default:switch(e=e&&e.$$typeof){case l:case h:case b:case f:case m:return e;default:return t}}case i:return t}}}function A(e){return C(e)===d}o.AsyncMode=u,o.ConcurrentMode=d,o.ContextConsumer=l,o.ContextProvider=m,o.Element=a,o.ForwardRef=h,o.Fragment=r,o.Lazy=b,o.Memo=f,o.Portal=i,o.Profiler=c,o.StrictMode=s,o.Suspense=p,o.isAsyncMode=function(e){return A(e)||C(e)===u},o.isConcurrentMode=A,o.isContextConsumer=function(e){return C(e)===l},o.isContextProvider=function(e){return C(e)===m},o.isElement=function(e){return"object"==typeof e&&null!==e&&e.$$typeof===a},o.isForwardRef=function(e){return C(e)===h},o.isFragment=function(e){return C(e)===r},o.isLazy=function(e){return C(e)===b},o.isMemo=function(e){return C(e)===f},o.isPortal=function(e){return C(e)===i},o.isProfiler=function(e){return C(e)===c},o.isStrictMode=function(e){return C(e)===s},o.isSuspense=function(e){return C(e)===p},o.isValidElementType=function(e){return"string"==typeof e||"function"==typeof e||e===r||e===d||e===c||e===s||e===p||e===g||"object"==typeof e&&null!==e&&(e.$$typeof===b||e.$$typeof===f||e.$$typeof===m||e.$$typeof===l||e.$$typeof===h||e.$$typeof===w||e.$$typeof===y||e.$$typeof===k||e.$$typeof===v)},o.typeOf=C},{}],25:[function(e,t,o){(function(o){"use strict";"production"===o.env.NODE_ENV?t.exports=e("./cjs/react-is.production.min.js"):t.exports=e("./cjs/react-is.development.js")}).call(this,e("_process"))},{"./cjs/react-is.development.js":23,"./cjs/react-is.production.min.js":24,_process:13}],26:[function(e,t,o){
/** @license React v16.13.0
 * react.development.js
 *
 * Copyright (c) Facebook, Inc. and its affiliates.
 *
 * This source code is licensed under the MIT license found in the
 * LICENSE file in the root directory of this source tree.
 */
"use strict"},{"object-assign":11,"prop-types/checkPropTypes":14}],27:[function(e,t,o){
/** @license React v16.13.0
 * react.production.min.js
 *
 * Copyright (c) Facebook, Inc. and its affiliates.
 *
 * This source code is licensed under the MIT license found in the
 * LICENSE file in the root directory of this source tree.
 */
"use strict";var n=e("object-assign"),a="function"==typeof Symbol&&Symbol.for,i=a?Symbol.for("react.element"):60103,r=a?Symbol.for("react.portal"):60106,s=a?Symbol.for("react.fragment"):60107,c=a?Symbol.for("react.strict_mode"):60108,m=a?Symbol.for("react.profiler"):60114,l=a?Symbol.for("react.provider"):60109,u=a?Symbol.for("react.context"):60110,d=a?Symbol.for("react.forward_ref"):60112,h=a?Symbol.for("react.suspense"):60113,p=a?Symbol.for("react.memo"):60115,g=a?Symbol.for("react.lazy"):60116,f="function"==typeof Symbol&&Symbol.iterator;function b(e){for(var t="https://reactjs.org/docs/error-decoder.html?invariant="+e,o=1;o<arguments.length;o++)t+="&args[]="+encodeURIComponent(arguments[o]);return"Minified React error #"+e+"; visit "+t+" for the full message or use the non-minified dev environment for full errors and additional helpful warnings."}var v={isMounted:function(){return!1},enqueueForceUpdate:function(){},enqueueReplaceState:function(){},enqueueSetState:function(){}},w={};function y(e,t,o){this.props=e,this.context=t,this.refs=w,this.updater=o||v}function k(){}function C(e,t,o){this.props=e,this.context=t,this.refs=w,this.updater=o||v}y.prototype.isReactComponent={},y.prototype.setState=function(e,t){if("object"!=typeof e&&"function"!=typeof e&&null!=e)throw Error(b(85));this.updater.enqueueSetState(this,e,t,"setState")},y.prototype.forceUpdate=function(e){this.updater.enqueueForceUpdate(this,e,"forceUpdate")},k.prototype=y.prototype;var A=C.prototype=new k;A.constructor=C,n(A,y.prototype),A.isPureReactComponent=!0;var x={current:null},M=Object.prototype.hasOwnProperty,_={key:!0,ref:!0,__self:!0,__source:!0};function D(e,t,o){var n,a={},r=null,s=null;if(null!=t)for(n in void 0!==t.ref&&(s=t.ref),void 0!==t.key&&(r=""+t.key),t)M.call(t,n)&&!_.hasOwnProperty(n)&&(a[n]=t[n]);var c=arguments.length-2;if(1===c)a.children=o;else if(1<c){for(var m=Array(c),l=0;l<c;l++)m[l]=arguments[l+2];a.children=m}if(e&&e.defaultProps)for(n in c=e.defaultProps)void 0===a[n]&&(a[n]=c[n]);return{$$typeof:i,type:e,key:r,ref:s,props:a,_owner:x.current}}function E(e){return"object"==typeof e&&null!==e&&e.$$typeof===i}var T=/\/+/g,q=[];function S(e,t,o,n){if(q.length){var a=q.pop();return a.result=e,a.keyPrefix=t,a.func=o,a.context=n,a.count=0,a}return{result:e,keyPrefix:t,func:o,context:n,count:0}}function z(e){e.result=null,e.keyPrefix=null,e.func=null,e.context=null,e.count=0,10>q.length&&q.push(e)}function V(e,t,o){return null==e?0:function e(t,o,n,a){var s=typeof t;"undefined"!==s&&"boolean"!==s||(t=null);var c=!1;if(null===t)c=!0;else switch(s){case"string":case"number":c=!0;break;case"object":switch(t.$$typeof){case i:case r:c=!0}}if(c)return n(a,t,""===o?"."+B(t,0):o),1;if(c=0,o=""===o?".":o+":",Array.isArray(t))for(var m=0;m<t.length;m++){var l=o+B(s=t[m],m);c+=e(s,l,n,a)}else if(null===t||"object"!=typeof t?l=null:l="function"==typeof(l=f&&t[f]||t["@@iterator"])?l:null,"function"==typeof l)for(t=l.call(t),m=0;!(s=t.next()).done;)c+=e(s=s.value,l=o+B(s,m++),n,a);else if("object"===s)throw n=""+t,Error(b(31,"[object Object]"===n?"object with keys {"+Object.keys(t).join(", ")+"}":n,""));return c}(e,"",t,o)}function B(e,t){return"object"==typeof e&&null!==e&&null!=e.key?function(e){var t={"=":"=0",":":"=2"};return"$"+(""+e).replace(/[=:]/g,(function(e){return t[e]}))}(e.key):t.toString(36)}function R(e,t){e.func.call(e.context,t,e.count++)}function G(e,t,o){var n=e.result,a=e.keyPrefix;e=e.func.call(e.context,t,e.count++),Array.isArray(e)?j(e,n,o,(function(e){return e})):null!=e&&(E(e)&&(e=function(e,t){return{$$typeof:i,type:e.type,key:t,ref:e.ref,props:e.props,_owner:e._owner}}(e,a+(!e.key||t&&t.key===e.key?"":(""+e.key).replace(T,"$&/")+"/")+o)),n.push(e))}function j(e,t,o,n,a){var i="";null!=o&&(i=(""+o).replace(T,"$&/")+"/"),V(e,G,t=S(t,i,n,a)),z(t)}var F={current:null};function H(){var e=F.current;if(null===e)throw Error(b(321));return e}var N={ReactCurrentDispatcher:F,ReactCurrentBatchConfig:{suspense:null},ReactCurrentOwner:x,IsSomeRendererActing:{current:!1},assign:n};o.Children={map:function(e,t,o){if(null==e)return e;var n=[];return j(e,n,null,t,o),n},forEach:function(e,t,o){if(null==e)return e;V(e,R,t=S(null,null,t,o)),z(t)},count:function(e){return V(e,(function(){return null}),null)},toArray:function(e){var t=[];return j(e,t,null,(function(e){return e})),t},only:function(e){if(!E(e))throw Error(b(143));return e}},o.Component=y,o.Fragment=s,o.Profiler=m,o.PureComponent=C,o.StrictMode=c,o.Suspense=h,o.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED=N,o.cloneElement=function(e,t,o){if(null==e)throw Error(b(267,e));var a=n({},e.props),r=e.key,s=e.ref,c=e._owner;if(null!=t){if(void 0!==t.ref&&(s=t.ref,c=x.current),void 0!==t.key&&(r=""+t.key),e.type&&e.type.defaultProps)var m=e.type.defaultProps;for(l in t)M.call(t,l)&&!_.hasOwnProperty(l)&&(a[l]=void 0===t[l]&&void 0!==m?m[l]:t[l])}var l=arguments.length-2;if(1===l)a.children=o;else if(1<l){m=Array(l);for(var u=0;u<l;u++)m[u]=arguments[u+2];a.children=m}return{$$typeof:i,type:e.type,key:r,ref:s,props:a,_owner:c}},o.createContext=function(e,t){return void 0===t&&(t=null),(e={$$typeof:u,_calculateChangedBits:t,_currentValue:e,_currentValue2:e,_threadCount:0,Provider:null,Consumer:null}).Provider={$$typeof:l,_context:e},e.Consumer=e},o.createElement=D,o.createFactory=function(e){var t=D.bind(null,e);return t.type=e,t},o.createRef=function(){return{current:null}},o.forwardRef=function(e){return{$$typeof:d,render:e}},o.isValidElement=E,o.lazy=function(e){return{$$typeof:g,_ctor:e,_status:-1,_result:null}},o.memo=function(e,t){return{$$typeof:p,type:e,compare:void 0===t?null:t}},o.useCallback=function(e,t){return H().useCallback(e,t)},o.useContext=function(e,t){return H().useContext(e,t)},o.useDebugValue=function(){},o.useEffect=function(e,t){return H().useEffect(e,t)},o.useImperativeHandle=function(e,t,o){return H().useImperativeHandle(e,t,o)},o.useLayoutEffect=function(e,t){return H().useLayoutEffect(e,t)},o.useMemo=function(e,t){return H().useMemo(e,t)},o.useReducer=function(e,t,o){return H().useReducer(e,t,o)},o.useRef=function(e){return H().useRef(e)},o.useState=function(e){return H().useState(e)},o.version="16.13.0"},{"object-assign":11}],28:[function(e,t,o){"use strict";t.exports=e("./cjs/react.production.min.js")},{"./cjs/react.development.js":26,"./cjs/react.production.min.js":27}],29:[function(e,t,o){
/** @license React v0.19.0
 * scheduler-tracing.development.js
 *
 * Copyright (c) Facebook, Inc. and its affiliates.
 *
 * This source code is licensed under the MIT license found in the
 * LICENSE file in the root directory of this source tree.
 */
"use strict"},{}],30:[function(e,t,o){
/** @license React v0.19.0
 * scheduler-tracing.production.min.js
 *
 * Copyright (c) Facebook, Inc. and its affiliates.
 *
 * This source code is licensed under the MIT license found in the
 * LICENSE file in the root directory of this source tree.
 */
"use strict";var n=0;o.__interactionsRef=null,o.__subscriberRef=null,o.unstable_clear=function(e){return e()},o.unstable_getCurrent=function(){return null},o.unstable_getThreadID=function(){return++n},o.unstable_subscribe=function(){},o.unstable_trace=function(e,t,o){return o()},o.unstable_unsubscribe=function(){},o.unstable_wrap=function(e){return e}},{}],31:[function(e,t,o){
/** @license React v0.19.0
 * scheduler.development.js
 *
 * Copyright (c) Facebook, Inc. and its affiliates.
 *
 * This source code is licensed under the MIT license found in the
 * LICENSE file in the root directory of this source tree.
 */
"use strict"},{}],32:[function(e,t,o){
/** @license React v0.19.0
 * scheduler.production.min.js
 *
 * Copyright (c) Facebook, Inc. and its affiliates.
 *
 * This source code is licensed under the MIT license found in the
 * LICENSE file in the root directory of this source tree.
 */
"use strict";var n,a,i,r,s;if("undefined"==typeof window||"function"!=typeof MessageChannel){var c=null,m=null,l=function(){if(null!==c)try{var e=o.unstable_now();c(!0,e),c=null}catch(e){throw setTimeout(l,0),e}},u=Date.now();o.unstable_now=function(){return Date.now()-u},n=function(e){null!==c?setTimeout(n,0,e):(c=e,setTimeout(l,0))},a=function(e,t){m=setTimeout(e,t)},i=function(){clearTimeout(m)},r=function(){return!1},s=o.unstable_forceFrameRate=function(){}}else{var d=window.performance,h=window.Date,p=window.setTimeout,g=window.clearTimeout;if("undefined"!=typeof console){var f=window.cancelAnimationFrame;"function"!=typeof window.requestAnimationFrame&&console.error("This browser doesn't support requestAnimationFrame. Make sure that you load a polyfill in older browsers. https://fb.me/react-polyfills"),"function"!=typeof f&&console.error("This browser doesn't support cancelAnimationFrame. Make sure that you load a polyfill in older browsers. https://fb.me/react-polyfills")}if("object"==typeof d&&"function"==typeof d.now)o.unstable_now=function(){return d.now()};else{var b=h.now();o.unstable_now=function(){return h.now()-b}}var v=!1,w=null,y=-1,k=5,C=0;r=function(){return o.unstable_now()>=C},s=function(){},o.unstable_forceFrameRate=function(e){0>e||125<e?console.error("forceFrameRate takes a positive int between 0 and 125, forcing framerates higher than 125 fps is not unsupported"):k=0<e?Math.floor(1e3/e):5};var A=new MessageChannel,x=A.port2;A.port1.onmessage=function(){if(null!==w){var e=o.unstable_now();C=e+k;try{w(!0,e)?x.postMessage(null):(v=!1,w=null)}catch(e){throw x.postMessage(null),e}}else v=!1},n=function(e){w=e,v||(v=!0,x.postMessage(null))},a=function(e,t){y=p((function(){e(o.unstable_now())}),t)},i=function(){g(y),y=-1}}function M(e,t){var o=e.length;e.push(t);e:for(;;){var n=o-1>>>1,a=e[n];if(!(void 0!==a&&0<E(a,t)))break e;e[n]=t,e[o]=a,o=n}}function _(e){return void 0===(e=e[0])?null:e}function D(e){var t=e[0];if(void 0!==t){var o=e.pop();if(o!==t){e[0]=o;e:for(var n=0,a=e.length;n<a;){var i=2*(n+1)-1,r=e[i],s=i+1,c=e[s];if(void 0!==r&&0>E(r,o))void 0!==c&&0>E(c,r)?(e[n]=c,e[s]=o,n=s):(e[n]=r,e[i]=o,n=i);else{if(!(void 0!==c&&0>E(c,o)))break e;e[n]=c,e[s]=o,n=s}}}return t}return null}function E(e,t){var o=e.sortIndex-t.sortIndex;return 0!==o?o:e.id-t.id}var T=[],q=[],S=1,z=null,V=3,B=!1,R=!1,G=!1;function j(e){for(var t=_(q);null!==t;){if(null===t.callback)D(q);else{if(!(t.startTime<=e))break;D(q),t.sortIndex=t.expirationTime,M(T,t)}t=_(q)}}function F(e){if(G=!1,j(e),!R)if(null!==_(T))R=!0,n(H);else{var t=_(q);null!==t&&a(F,t.startTime-e)}}function H(e,t){R=!1,G&&(G=!1,i()),B=!0;var n=V;try{for(j(t),z=_(T);null!==z&&(!(z.expirationTime>t)||e&&!r());){var s=z.callback;if(null!==s){z.callback=null,V=z.priorityLevel;var c=s(z.expirationTime<=t);t=o.unstable_now(),"function"==typeof c?z.callback=c:z===_(T)&&D(T),j(t)}else D(T);z=_(T)}if(null!==z)var m=!0;else{var l=_(q);null!==l&&a(F,l.startTime-t),m=!1}return m}finally{z=null,V=n,B=!1}}function N(e){switch(e){case 1:return-1;case 2:return 250;case 5:return 1073741823;case 4:return 1e4;default:return 5e3}}var I=s;o.unstable_IdlePriority=5,o.unstable_ImmediatePriority=1,o.unstable_LowPriority=4,o.unstable_NormalPriority=3,o.unstable_Profiling=null,o.unstable_UserBlockingPriority=2,o.unstable_cancelCallback=function(e){e.callback=null},o.unstable_continueExecution=function(){R||B||(R=!0,n(H))},o.unstable_getCurrentPriorityLevel=function(){return V},o.unstable_getFirstCallbackNode=function(){return _(T)},o.unstable_next=function(e){switch(V){case 1:case 2:case 3:var t=3;break;default:t=V}var o=V;V=t;try{return e()}finally{V=o}},o.unstable_pauseExecution=function(){},o.unstable_requestPaint=I,o.unstable_runWithPriority=function(e,t){switch(e){case 1:case 2:case 3:case 4:case 5:break;default:e=3}var o=V;V=e;try{return t()}finally{V=o}},o.unstable_scheduleCallback=function(e,t,r){var s=o.unstable_now();if("object"==typeof r&&null!==r){var c=r.delay;c="number"==typeof c&&0<c?s+c:s,r="number"==typeof r.timeout?r.timeout:N(e)}else r=N(e),c=s;return e={id:S++,callback:t,priorityLevel:e,startTime:c,expirationTime:r=c+r,sortIndex:-1},c>s?(e.sortIndex=c,M(q,e),null===_(T)&&e===_(q)&&(G?i():G=!0,a(F,c-s))):(e.sortIndex=r,M(T,e),R||B||(R=!0,n(H))),e},o.unstable_shouldYield=function(){var e=o.unstable_now();j(e);var t=_(T);return t!==z&&null!==z&&null!==t&&null!==t.callback&&t.startTime<=e&&t.expirationTime<z.expirationTime||r()},o.unstable_wrapCallback=function(e){var t=V;return function(){var o=V;V=t;try{return e.apply(this,arguments)}finally{V=o}}}},{}],33:[function(e,t,o){"use strict";t.exports=e("./cjs/scheduler.production.min.js")},{"./cjs/scheduler.development.js":31,"./cjs/scheduler.production.min.js":32}],34:[function(e,t,o){"use strict";t.exports=e("./cjs/scheduler-tracing.production.min.js")},{"./cjs/scheduler-tracing.development.js":29,"./cjs/scheduler-tracing.production.min.js":30}],35:[function(e,t,o){(function(t,n){var a=e("process/browser.js").nextTick,i=Function.prototype.apply,r=Array.prototype.slice,s={},c=0;function m(e,t){this._id=e,this._clearFn=t}o.setTimeout=function(){return new m(i.call(setTimeout,window,arguments),clearTimeout)},o.setInterval=function(){return new m(i.call(setInterval,window,arguments),clearInterval)},o.clearTimeout=o.clearInterval=function(e){e.close()},m.prototype.unref=m.prototype.ref=function(){},m.prototype.close=function(){this._clearFn.call(window,this._id)},o.enroll=function(e,t){clearTimeout(e._idleTimeoutId),e._idleTimeout=t},o.unenroll=function(e){clearTimeout(e._idleTimeoutId),e._idleTimeout=-1},o._unrefActive=o.active=function(e){clearTimeout(e._idleTimeoutId);var t=e._idleTimeout;t>=0&&(e._idleTimeoutId=setTimeout((function(){e._onTimeout&&e._onTimeout()}),t))},o.setImmediate="function"==typeof t?t:function(e){var t=c++,n=!(arguments.length<2)&&r.call(arguments,1);return s[t]=!0,a((function(){s[t]&&(n?e.apply(null,n):e.call(null),o.clearImmediate(t))})),t},o.clearImmediate="function"==typeof n?n:function(e){delete s[e]}}).call(this,e("timers").setImmediate,e("timers").clearImmediate)},{"process/browser.js":13,timers:35}],36:[function(e,t,o){(function(){var e=this,n=e._,a={},i=Array.prototype,r=Object.prototype,s=Function.prototype,c=i.push,m=i.slice,l=i.concat,u=r.toString,d=r.hasOwnProperty,h=i.forEach,p=i.map,g=i.reduce,f=i.reduceRight,b=i.filter,v=i.every,w=i.some,y=i.indexOf,k=i.lastIndexOf,C=Array.isArray,A=Object.keys,x=s.bind,M=function(e){return e instanceof M?e:this instanceof M?void(this._wrapped=e):new M(e)};void 0!==o?(void 0!==t&&t.exports&&(o=t.exports=M),o._=M):e._=M,M.VERSION="1.4.4";var _=M.each=M.forEach=function(e,t,o){if(null!=e)if(h&&e.forEach===h)e.forEach(t,o);else if(e.length===+e.length){for(var n=0,i=e.length;n<i;n++)if(t.call(o,e[n],n,e)===a)return}else for(var r in e)if(M.has(e,r)&&t.call(o,e[r],r,e)===a)return};M.map=M.collect=function(e,t,o){var n=[];return null==e?n:p&&e.map===p?e.map(t,o):(_(e,(function(e,a,i){n[n.length]=t.call(o,e,a,i)})),n)};var D="Reduce of empty array with no initial value";M.reduce=M.foldl=M.inject=function(e,t,o,n){var a=arguments.length>2;if(null==e&&(e=[]),g&&e.reduce===g)return n&&(t=M.bind(t,n)),a?e.reduce(t,o):e.reduce(t);if(_(e,(function(e,i,r){a?o=t.call(n,o,e,i,r):(o=e,a=!0)})),!a)throw new TypeError(D);return o},M.reduceRight=M.foldr=function(e,t,o,n){var a=arguments.length>2;if(null==e&&(e=[]),f&&e.reduceRight===f)return n&&(t=M.bind(t,n)),a?e.reduceRight(t,o):e.reduceRight(t);var i=e.length;if(i!==+i){var r=M.keys(e);i=r.length}if(_(e,(function(s,c,m){c=r?r[--i]:--i,a?o=t.call(n,o,e[c],c,m):(o=e[c],a=!0)})),!a)throw new TypeError(D);return o},M.find=M.detect=function(e,t,o){var n;return E(e,(function(e,a,i){if(t.call(o,e,a,i))return n=e,!0})),n},M.filter=M.select=function(e,t,o){var n=[];return null==e?n:b&&e.filter===b?e.filter(t,o):(_(e,(function(e,a,i){t.call(o,e,a,i)&&(n[n.length]=e)})),n)},M.reject=function(e,t,o){return M.filter(e,(function(e,n,a){return!t.call(o,e,n,a)}),o)},M.every=M.all=function(e,t,o){t||(t=M.identity);var n=!0;return null==e?n:v&&e.every===v?e.every(t,o):(_(e,(function(e,i,r){if(!(n=n&&t.call(o,e,i,r)))return a})),!!n)};var E=M.some=M.any=function(e,t,o){t||(t=M.identity);var n=!1;return null==e?n:w&&e.some===w?e.some(t,o):(_(e,(function(e,i,r){if(n||(n=t.call(o,e,i,r)))return a})),!!n)};M.contains=M.include=function(e,t){return null!=e&&(y&&e.indexOf===y?-1!=e.indexOf(t):E(e,(function(e){return e===t})))},M.invoke=function(e,t){var o=m.call(arguments,2),n=M.isFunction(t);return M.map(e,(function(e){return(n?t:e[t]).apply(e,o)}))},M.pluck=function(e,t){return M.map(e,(function(e){return e[t]}))},M.where=function(e,t,o){return M.isEmpty(t)?o?null:[]:M[o?"find":"filter"](e,(function(e){for(var o in t)if(t[o]!==e[o])return!1;return!0}))},M.findWhere=function(e,t){return M.where(e,t,!0)},M.max=function(e,t,o){if(!t&&M.isArray(e)&&e[0]===+e[0]&&e.length<65535)return Math.max.apply(Math,e);if(!t&&M.isEmpty(e))return-1/0;var n={computed:-1/0,value:-1/0};return _(e,(function(e,a,i){var r=t?t.call(o,e,a,i):e;r>=n.computed&&(n={value:e,computed:r})})),n.value},M.min=function(e,t,o){if(!t&&M.isArray(e)&&e[0]===+e[0]&&e.length<65535)return Math.min.apply(Math,e);if(!t&&M.isEmpty(e))return 1/0;var n={computed:1/0,value:1/0};return _(e,(function(e,a,i){var r=t?t.call(o,e,a,i):e;r<n.computed&&(n={value:e,computed:r})})),n.value},M.shuffle=function(e){var t,o=0,n=[];return _(e,(function(e){t=M.random(o++),n[o-1]=n[t],n[t]=e})),n};var T=function(e){return M.isFunction(e)?e:function(t){return t[e]}};M.sortBy=function(e,t,o){var n=T(t);return M.pluck(M.map(e,(function(e,t,a){return{value:e,index:t,criteria:n.call(o,e,t,a)}})).sort((function(e,t){var o=e.criteria,n=t.criteria;if(o!==n){if(o>n||void 0===o)return 1;if(o<n||void 0===n)return-1}return e.index<t.index?-1:1})),"value")};var q=function(e,t,o,n){var a={},i=T(t||M.identity);return _(e,(function(t,r){var s=i.call(o,t,r,e);n(a,s,t)})),a};M.groupBy=function(e,t,o){return q(e,t,o,(function(e,t,o){(M.has(e,t)?e[t]:e[t]=[]).push(o)}))},M.countBy=function(e,t,o){return q(e,t,o,(function(e,t){M.has(e,t)||(e[t]=0),e[t]++}))},M.sortedIndex=function(e,t,o,n){for(var a=(o=null==o?M.identity:T(o)).call(n,t),i=0,r=e.length;i<r;){var s=i+r>>>1;o.call(n,e[s])<a?i=s+1:r=s}return i},M.toArray=function(e){return e?M.isArray(e)?m.call(e):e.length===+e.length?M.map(e,M.identity):M.values(e):[]},M.size=function(e){return null==e?0:e.length===+e.length?e.length:M.keys(e).length},M.first=M.head=M.take=function(e,t,o){if(null!=e)return null==t||o?e[0]:m.call(e,0,t)},M.initial=function(e,t,o){return m.call(e,0,e.length-(null==t||o?1:t))},M.last=function(e,t,o){if(null!=e)return null==t||o?e[e.length-1]:m.call(e,Math.max(e.length-t,0))},M.rest=M.tail=M.drop=function(e,t,o){return m.call(e,null==t||o?1:t)},M.compact=function(e){return M.filter(e,M.identity)};var S=function(e,t,o){return _(e,(function(e){M.isArray(e)?t?c.apply(o,e):S(e,t,o):o.push(e)})),o};M.flatten=function(e,t){return S(e,t,[])},M.without=function(e){return M.difference(e,m.call(arguments,1))},M.uniq=M.unique=function(e,t,o,n){M.isFunction(t)&&(n=o,o=t,t=!1);var a=o?M.map(e,o,n):e,i=[],r=[];return _(a,(function(o,n){(t?n&&r[r.length-1]===o:M.contains(r,o))||(r.push(o),i.push(e[n]))})),i},M.union=function(){return M.uniq(l.apply(i,arguments))},M.intersection=function(e){var t=m.call(arguments,1);return M.filter(M.uniq(e),(function(e){return M.every(t,(function(t){return M.indexOf(t,e)>=0}))}))},M.difference=function(e){var t=l.apply(i,m.call(arguments,1));return M.filter(e,(function(e){return!M.contains(t,e)}))},M.zip=function(){for(var e=m.call(arguments),t=M.max(M.pluck(e,"length")),o=new Array(t),n=0;n<t;n++)o[n]=M.pluck(e,""+n);return o},M.object=function(e,t){if(null==e)return{};for(var o={},n=0,a=e.length;n<a;n++)t?o[e[n]]=t[n]:o[e[n][0]]=e[n][1];return o},M.indexOf=function(e,t,o){if(null==e)return-1;var n=0,a=e.length;if(o){if("number"!=typeof o)return e[n=M.sortedIndex(e,t)]===t?n:-1;n=o<0?Math.max(0,a+o):o}if(y&&e.indexOf===y)return e.indexOf(t,o);for(;n<a;n++)if(e[n]===t)return n;return-1},M.lastIndexOf=function(e,t,o){if(null==e)return-1;var n=null!=o;if(k&&e.lastIndexOf===k)return n?e.lastIndexOf(t,o):e.lastIndexOf(t);for(var a=n?o:e.length;a--;)if(e[a]===t)return a;return-1},M.range=function(e,t,o){arguments.length<=1&&(t=e||0,e=0),o=arguments[2]||1;for(var n=Math.max(Math.ceil((t-e)/o),0),a=0,i=new Array(n);a<n;)i[a++]=e,e+=o;return i},M.bind=function(e,t){if(e.bind===x&&x)return x.apply(e,m.call(arguments,1));var o=m.call(arguments,2);return function(){return e.apply(t,o.concat(m.call(arguments)))}},M.partial=function(e){var t=m.call(arguments,1);return function(){return e.apply(this,t.concat(m.call(arguments)))}},M.bindAll=function(e){var t=m.call(arguments,1);return 0===t.length&&(t=M.functions(e)),_(t,(function(t){e[t]=M.bind(e[t],e)})),e},M.memoize=function(e,t){var o={};return t||(t=M.identity),function(){var n=t.apply(this,arguments);return M.has(o,n)?o[n]:o[n]=e.apply(this,arguments)}},M.delay=function(e,t){var o=m.call(arguments,2);return setTimeout((function(){return e.apply(null,o)}),t)},M.defer=function(e){return M.delay.apply(M,[e,1].concat(m.call(arguments,1)))},M.throttle=function(e,t){var o,n,a,i,r=0,s=function(){r=new Date,a=null,i=e.apply(o,n)};return function(){var c=new Date,m=t-(c-r);return o=this,n=arguments,m<=0?(clearTimeout(a),a=null,r=c,i=e.apply(o,n)):a||(a=setTimeout(s,m)),i}},M.debounce=function(e,t,o){var n,a;return function(){var i=this,r=arguments,s=function(){n=null,o||(a=e.apply(i,r))},c=o&&!n;return clearTimeout(n),n=setTimeout(s,t),c&&(a=e.apply(i,r)),a}},M.once=function(e){var t,o=!1;return function(){return o||(o=!0,t=e.apply(this,arguments),e=null),t}},M.wrap=function(e,t){return function(){var o=[e];return c.apply(o,arguments),t.apply(this,o)}},M.compose=function(){var e=arguments;return function(){for(var t=arguments,o=e.length-1;o>=0;o--)t=[e[o].apply(this,t)];return t[0]}},M.after=function(e,t){return e<=0?t():function(){if(--e<1)return t.apply(this,arguments)}},M.keys=A||function(e){if(e!==Object(e))throw new TypeError("Invalid object");var t=[];for(var o in e)M.has(e,o)&&(t[t.length]=o);return t},M.values=function(e){var t=[];for(var o in e)M.has(e,o)&&t.push(e[o]);return t},M.pairs=function(e){var t=[];for(var o in e)M.has(e,o)&&t.push([o,e[o]]);return t},M.invert=function(e){var t={};for(var o in e)M.has(e,o)&&(t[e[o]]=o);return t},M.functions=M.methods=function(e){var t=[];for(var o in e)M.isFunction(e[o])&&t.push(o);return t.sort()},M.extend=function(e){return _(m.call(arguments,1),(function(t){if(t)for(var o in t)e[o]=t[o]})),e},M.pick=function(e){var t={},o=l.apply(i,m.call(arguments,1));return _(o,(function(o){o in e&&(t[o]=e[o])})),t},M.omit=function(e){var t={},o=l.apply(i,m.call(arguments,1));for(var n in e)M.contains(o,n)||(t[n]=e[n]);return t},M.defaults=function(e){return _(m.call(arguments,1),(function(t){if(t)for(var o in t)null==e[o]&&(e[o]=t[o])})),e},M.clone=function(e){return M.isObject(e)?M.isArray(e)?e.slice():M.extend({},e):e},M.tap=function(e,t){return t(e),e};var z=function(e,t,o,n){if(e===t)return 0!==e||1/e==1/t;if(null==e||null==t)return e===t;e instanceof M&&(e=e._wrapped),t instanceof M&&(t=t._wrapped);var a=u.call(e);if(a!=u.call(t))return!1;switch(a){case"[object String]":return e==String(t);case"[object Number]":return e!=+e?t!=+t:0==e?1/e==1/t:e==+t;case"[object Date]":case"[object Boolean]":return+e==+t;case"[object RegExp]":return e.source==t.source&&e.global==t.global&&e.multiline==t.multiline&&e.ignoreCase==t.ignoreCase}if("object"!=typeof e||"object"!=typeof t)return!1;for(var i=o.length;i--;)if(o[i]==e)return n[i]==t;o.push(e),n.push(t);var r=0,s=!0;if("[object Array]"==a){if(s=(r=e.length)==t.length)for(;r--&&(s=z(e[r],t[r],o,n)););}else{var c=e.constructor,m=t.constructor;if(c!==m&&!(M.isFunction(c)&&c instanceof c&&M.isFunction(m)&&m instanceof m))return!1;for(var l in e)if(M.has(e,l)&&(r++,!(s=M.has(t,l)&&z(e[l],t[l],o,n))))break;if(s){for(l in t)if(M.has(t,l)&&!r--)break;s=!r}}return o.pop(),n.pop(),s};M.isEqual=function(e,t){return z(e,t,[],[])},M.isEmpty=function(e){if(null==e)return!0;if(M.isArray(e)||M.isString(e))return 0===e.length;for(var t in e)if(M.has(e,t))return!1;return!0},M.isElement=function(e){return!(!e||1!==e.nodeType)},M.isArray=C||function(e){return"[object Array]"==u.call(e)},M.isObject=function(e){return e===Object(e)},_(["Arguments","Function","String","Number","Date","RegExp"],(function(e){M["is"+e]=function(t){return u.call(t)=="[object "+e+"]"}})),M.isArguments(arguments)||(M.isArguments=function(e){return!(!e||!M.has(e,"callee"))}),"function"!=typeof/./&&(M.isFunction=function(e){return"function"==typeof e}),M.isFinite=function(e){return isFinite(e)&&!isNaN(parseFloat(e))},M.isNaN=function(e){return M.isNumber(e)&&e!=+e},M.isBoolean=function(e){return!0===e||!1===e||"[object Boolean]"==u.call(e)},M.isNull=function(e){return null===e},M.isUndefined=function(e){return void 0===e},M.has=function(e,t){return d.call(e,t)},M.noConflict=function(){return e._=n,this},M.identity=function(e){return e},M.times=function(e,t,o){for(var n=Array(e),a=0;a<e;a++)n[a]=t.call(o,a);return n},M.random=function(e,t){return null==t&&(t=e,e=0),e+Math.floor(Math.random()*(t-e+1))};var V={escape:{"&":"&amp;","<":"&lt;",">":"&gt;",'"':"&quot;","'":"&#x27;","/":"&#x2F;"}};V.unescape=M.invert(V.escape);var B={escape:new RegExp("["+M.keys(V.escape).join("")+"]","g"),unescape:new RegExp("("+M.keys(V.unescape).join("|")+")","g")};M.each(["escape","unescape"],(function(e){M[e]=function(t){return null==t?"":(""+t).replace(B[e],(function(t){return V[e][t]}))}})),M.result=function(e,t){if(null==e)return null;var o=e[t];return M.isFunction(o)?o.call(e):o},M.mixin=function(e){_(M.functions(e),(function(t){var o=M[t]=e[t];M.prototype[t]=function(){var e=[this._wrapped];return c.apply(e,arguments),H.call(this,o.apply(M,e))}}))};var R=0;M.uniqueId=function(e){var t=++R+"";return e?e+t:t},M.templateSettings={evaluate:/<%([\s\S]+?)%>/g,interpolate:/<%=([\s\S]+?)%>/g,escape:/<%-([\s\S]+?)%>/g};var G=/(.)^/,j={"'":"'","\\":"\\","\r":"r","\n":"n","\t":"t","\u2028":"u2028","\u2029":"u2029"},F=/\\|'|\r|\n|\t|\u2028|\u2029/g;M.template=function(e,t,o){var n;o=M.defaults({},o,M.templateSettings);var a=new RegExp([(o.escape||G).source,(o.interpolate||G).source,(o.evaluate||G).source].join("|")+"|$","g"),i=0,r="__p+='";e.replace(a,(function(t,o,n,a,s){return r+=e.slice(i,s).replace(F,(function(e){return"\\"+j[e]})),o&&(r+="'+\n((__t=("+o+"))==null?'':_.escape(__t))+\n'"),n&&(r+="'+\n((__t=("+n+"))==null?'':__t)+\n'"),a&&(r+="';\n"+a+"\n__p+='"),i=s+t.length,t})),r+="';\n",o.variable||(r="with(obj||{}){\n"+r+"}\n"),r="var __t,__p='',__j=Array.prototype.join,print=function(){__p+=__j.call(arguments,'');};\n"+r+"return __p;\n";try{n=new Function(o.variable||"obj","_",r)}catch(e){throw e.source=r,e}if(t)return n(t,M);var s=function(e){return n.call(this,e,M)};return s.source="function("+(o.variable||"obj")+"){\n"+r+"}",s},M.chain=function(e){return M(e).chain()};var H=function(e){return this._chain?M(e).chain():e};M.mixin(M),_(["pop","push","reverse","shift","sort","splice","unshift"],(function(e){var t=i[e];M.prototype[e]=function(){var o=this._wrapped;return t.apply(o,arguments),"shift"!=e&&"splice"!=e||0!==o.length||delete o[0],H.call(this,o)}})),_(["concat","join","slice"],(function(e){var t=i[e];M.prototype[e]=function(){return H.call(this,t.apply(this._wrapped,arguments))}})),M.extend(M.prototype,{chain:function(){return this._chain=!0,this},value:function(){return this._wrapped}})}).call(this)},{}],37:[function(e,t,o){"function"==typeof Object.create?t.exports=function(e,t){e.super_=t,e.prototype=Object.create(t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}})}:t.exports=function(e,t){e.super_=t;var o=function(){};o.prototype=t.prototype,e.prototype=new o,e.prototype.constructor=e}},{}],38:[function(e,t,o){t.exports=function(e){return e&&"object"==typeof e&&"function"==typeof e.copy&&"function"==typeof e.fill&&"function"==typeof e.readUInt8}},{}],39:[function(e,t,o){(function(t,n){var a=/%[sdj%]/g;o.format=function(e){if(!b(e)){for(var t=[],o=0;o<arguments.length;o++)t.push(s(arguments[o]));return t.join(" ")}o=1;for(var n=arguments,i=n.length,r=String(e).replace(a,(function(e){if("%%"===e)return"%";if(o>=i)return e;switch(e){case"%s":return String(n[o++]);case"%d":return Number(n[o++]);case"%j":try{return JSON.stringify(n[o++])}catch(e){return"[Circular]"}default:return e}})),c=n[o];o<i;c=n[++o])g(c)||!y(c)?r+=" "+c:r+=" "+s(c);return r},o.deprecate=function(e,a){if(v(n.process))return function(){return o.deprecate(e,a).apply(this,arguments)};if(!0===t.noDeprecation)return e;var i=!1;return function(){if(!i){if(t.throwDeprecation)throw new Error(a);t.traceDeprecation?console.trace(a):console.error(a),i=!0}return e.apply(this,arguments)}};var i,r={};function s(e,t){var n={seen:[],stylize:m};return arguments.length>=3&&(n.depth=arguments[2]),arguments.length>=4&&(n.colors=arguments[3]),p(t)?n.showHidden=t:t&&o._extend(n,t),v(n.showHidden)&&(n.showHidden=!1),v(n.depth)&&(n.depth=2),v(n.colors)&&(n.colors=!1),v(n.customInspect)&&(n.customInspect=!0),n.colors&&(n.stylize=c),l(n,e,n.depth)}function c(e,t){var o=s.styles[t];return o?"["+s.colors[o][0]+"m"+e+"["+s.colors[o][1]+"m":e}function m(e,t){return e}function l(e,t,n){if(e.customInspect&&t&&A(t.inspect)&&t.inspect!==o.inspect&&(!t.constructor||t.constructor.prototype!==t)){var a=t.inspect(n,e);return b(a)||(a=l(e,a,n)),a}var i=function(e,t){if(v(t))return e.stylize("undefined","undefined");if(b(t)){var o="'"+JSON.stringify(t).replace(/^"|"$/g,"").replace(/'/g,"\\'").replace(/\\"/g,'"')+"'";return e.stylize(o,"string")}if(f(t))return e.stylize(""+t,"number");if(p(t))return e.stylize(""+t,"boolean");if(g(t))return e.stylize("null","null")}(e,t);if(i)return i;var r=Object.keys(t),s=function(e){var t={};return e.forEach((function(e,o){t[e]=!0})),t}(r);if(e.showHidden&&(r=Object.getOwnPropertyNames(t)),C(t)&&(r.indexOf("message")>=0||r.indexOf("description")>=0))return u(t);if(0===r.length){if(A(t)){var c=t.name?": "+t.name:"";return e.stylize("[Function"+c+"]","special")}if(w(t))return e.stylize(RegExp.prototype.toString.call(t),"regexp");if(k(t))return e.stylize(Date.prototype.toString.call(t),"date");if(C(t))return u(t)}var m,y="",x=!1,M=["{","}"];(h(t)&&(x=!0,M=["[","]"]),A(t))&&(y=" [Function"+(t.name?": "+t.name:"")+"]");return w(t)&&(y=" "+RegExp.prototype.toString.call(t)),k(t)&&(y=" "+Date.prototype.toUTCString.call(t)),C(t)&&(y=" "+u(t)),0!==r.length||x&&0!=t.length?n<0?w(t)?e.stylize(RegExp.prototype.toString.call(t),"regexp"):e.stylize("[Object]","special"):(e.seen.push(t),m=x?function(e,t,o,n,a){for(var i=[],r=0,s=t.length;r<s;++r)E(t,String(r))?i.push(d(e,t,o,n,String(r),!0)):i.push("");return a.forEach((function(a){a.match(/^\d+$/)||i.push(d(e,t,o,n,a,!0))})),i}(e,t,n,s,r):r.map((function(o){return d(e,t,n,s,o,x)})),e.seen.pop(),function(e,t,o){if(e.reduce((function(e,t){return t.indexOf("\n")>=0&&0,e+t.replace(/\u001b\[\d\d?m/g,"").length+1}),0)>60)return o[0]+(""===t?"":t+"\n ")+" "+e.join(",\n  ")+" "+o[1];return o[0]+t+" "+e.join(", ")+" "+o[1]}(m,y,M)):M[0]+y+M[1]}function u(e){return"["+Error.prototype.toString.call(e)+"]"}function d(e,t,o,n,a,i){var r,s,c;if((c=Object.getOwnPropertyDescriptor(t,a)||{value:t[a]}).get?s=c.set?e.stylize("[Getter/Setter]","special"):e.stylize("[Getter]","special"):c.set&&(s=e.stylize("[Setter]","special")),E(n,a)||(r="["+a+"]"),s||(e.seen.indexOf(c.value)<0?(s=g(o)?l(e,c.value,null):l(e,c.value,o-1)).indexOf("\n")>-1&&(s=i?s.split("\n").map((function(e){return"  "+e})).join("\n").substr(2):"\n"+s.split("\n").map((function(e){return"   "+e})).join("\n")):s=e.stylize("[Circular]","special")),v(r)){if(i&&a.match(/^\d+$/))return s;(r=JSON.stringify(""+a)).match(/^"([a-zA-Z_][a-zA-Z_0-9]*)"$/)?(r=r.substr(1,r.length-2),r=e.stylize(r,"name")):(r=r.replace(/'/g,"\\'").replace(/\\"/g,'"').replace(/(^"|"$)/g,"'"),r=e.stylize(r,"string"))}return r+": "+s}function h(e){return Array.isArray(e)}function p(e){return"boolean"==typeof e}function g(e){return null===e}function f(e){return"number"==typeof e}function b(e){return"string"==typeof e}function v(e){return void 0===e}function w(e){return y(e)&&"[object RegExp]"===x(e)}function y(e){return"object"==typeof e&&null!==e}function k(e){return y(e)&&"[object Date]"===x(e)}function C(e){return y(e)&&("[object Error]"===x(e)||e instanceof Error)}function A(e){return"function"==typeof e}function x(e){return Object.prototype.toString.call(e)}function M(e){return e<10?"0"+e.toString(10):e.toString(10)}o.debuglog=function(e){if(v(i)&&(i=t.env.NODE_DEBUG||""),e=e.toUpperCase(),!r[e])if(new RegExp("\\b"+e+"\\b","i").test(i)){var n=t.pid;r[e]=function(){var t=o.format.apply(o,arguments);console.error("%s %d: %s",e,n,t)}}else r[e]=function(){};return r[e]},o.inspect=s,s.colors={bold:[1,22],italic:[3,23],underline:[4,24],inverse:[7,27],white:[37,39],grey:[90,39],black:[30,39],blue:[34,39],cyan:[36,39],green:[32,39],magenta:[35,39],red:[31,39],yellow:[33,39]},s.styles={special:"cyan",number:"yellow",boolean:"yellow",undefined:"grey",null:"bold",string:"green",date:"magenta",regexp:"red"},o.isArray=h,o.isBoolean=p,o.isNull=g,o.isNullOrUndefined=function(e){return null==e},o.isNumber=f,o.isString=b,o.isSymbol=function(e){return"symbol"==typeof e},o.isUndefined=v,o.isRegExp=w,o.isObject=y,o.isDate=k,o.isError=C,o.isFunction=A,o.isPrimitive=function(e){return null===e||"boolean"==typeof e||"number"==typeof e||"string"==typeof e||"symbol"==typeof e||void 0===e},o.isBuffer=e("./support/isBuffer");var _=["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"];function D(){var e=new Date,t=[M(e.getHours()),M(e.getMinutes()),M(e.getSeconds())].join(":");return[e.getDate(),_[e.getMonth()],t].join(" ")}function E(e,t){return Object.prototype.hasOwnProperty.call(e,t)}o.log=function(){console.log("%s - %s",D(),o.format.apply(o,arguments))},o.inherits=e("inherits"),o._extend=function(e,t){if(!t||!y(t))return e;for(var o=Object.keys(t),n=o.length;n--;)e[o[n]]=t[o[n]];return e}}).call(this,e("_process"),"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{"./support/isBuffer":38,_process:13,inherits:37}],40:[function(e,t,o){"use strict";var n=e("../constants/AppConstants"),a=e("../dispatcher/AppDispatcher"),i=n.ActionTypes,r={submitCommand:function(e){a.handleViewAction({type:i.SUBMIT_COMMAND,text:e})}};t.exports=r},{"../constants/AppConstants":46,"../dispatcher/AppDispatcher":51}],41:[function(e,t,o){"use strict";var n=e("../constants/AppConstants"),a=e("../dispatcher/AppDispatcher"),i=n.ActionTypes,r={changeIsAnimating:function(e){a.handleViewAction({type:i.CHANGE_IS_ANIMATING,isAnimating:e})},levelSolved:function(){a.handleViewAction({type:i.LEVEL_SOLVED})},changeFlipTreeY:function(e){a.handleViewAction({type:i.CHANGE_FLIP_TREE_Y,flipTreeY:e})}};t.exports=r},{"../constants/AppConstants":46,"../dispatcher/AppDispatcher":51}],42:[function(e,t,o){"use strict";var n=e("../constants/AppConstants"),a=e("../dispatcher/AppDispatcher"),i=n.ActionTypes,r={setLevelSolved:function(e){a.handleViewAction({type:i.SET_LEVEL_SOLVED,levelID:e})},resetLevelsSolved:function(){a.handleViewAction({type:i.RESET_LEVELS_SOLVED})}};t.exports=r},{"../constants/AppConstants":46,"../dispatcher/AppDispatcher":51}],43:[function(e,t,o){"use strict";var n=e("../constants/AppConstants"),a=e("../dispatcher/AppDispatcher"),i=n.ActionTypes,r={changeLocale:function(e){a.handleViewAction({type:i.CHANGE_LOCALE,locale:e})},changeLocaleFromURI:function(e){a.handleURIAction({type:i.CHANGE_LOCALE,locale:e})},changeLocaleFromHeader:function(e){a.handleViewAction({type:i.CHANGE_LOCALE_FROM_HEADER,header:e})}};t.exports=r},{"../constants/AppConstants":46,"../dispatcher/AppDispatcher":51}],44:[function(e,t,o){var n,a,i,r,s=e("backbone"),c=e("events").EventEmitter,m=e("react"),l=e("react-dom"),u=e("../util"),d=e("../intl"),h=e("../stores/LocaleStore"),p=e("../actions/LocaleActions"),g=Object.assign({},c.prototype,{trigger:function(){this.emit.apply(this,arguments)}});g.setMaxListeners(0);var f=function(){var t=e("../sandbox/").Sandbox,o=e("../util/eventBaton").EventBaton,s=e("../views/levelDropdownView").LevelDropdownView;i=new o,n=new k,a=new t,r=new s({wait:!0}),h.subscribe((function(){h.getLocale()!==h.getDefaultLocale()&&v()})),g.on("vcsModeChange",b),w(i),y(a),window.LocaleStore=h,window.LocaleActions=p,window.intl=d},b=function(e){if(window.$){var t=e.mode,o="git"===e.mode,n=t.slice(0,1).toUpperCase()+t.slice(1),a=new RegExp("Git"===n?"Hg":"Git","g");document.title=d.str("learn-git-branching").replace(a,n),$("span.vcs-mode-aware").each((function(e,t){var o=$(t).text().replace(a,n);$(t).text(o)})),$("body").toggleClass("gitMode",o),$("body").toggleClass("hgMode",!o)}},v=function(){if(window.$){var t=h.getLocale().split("_")[0];$("html").attr("lang",t),$("meta[http-equiv='content-language']").attr("content",t),$("span.intl-aware").each((function(t,o){var n=e("../intl"),a=$(o).attr("data-intl");$(o).text(n.str(a))}))}},w=function(e){var t=function(){$("#commandTextField").focus()};t(),$(window).focus((function(t){e.trigger("windowFocus",t)})),$(document).click((function(t){e.trigger("documentClick",t)})),$(document).bind("keydown",(function(t){e.trigger("docKeydown",t)})),$(document).bind("keyup",(function(t){e.trigger("docKeyup",t)})),$(window).on("resize",(function(e){g.trigger("resize",e)})),e.stealBaton("docKeydown",(function(){})),e.stealBaton("docKeyup",(function(){})),e.stealBaton("windowFocus",t),e.stealBaton("documentClick",t);var o=function(t){return function(){var o=[t];Array.prototype.slice.apply(arguments).forEach((function(e){o.push(e)})),e.trigger.apply(e,o)}};$("#commandTextField").on("keydown",o("keydown")),$("#commandTextField").on("keyup",o("keyup")),$(window).trigger("resize")},y=function(e){var t,o,n,a,r=u.parseQueryString(window.location.href);if((/(iPhone|iPod|iPad).*AppleWebKit/i.test(navigator.userAgent)||/android/i.test(navigator.userAgent))&&e.mainVis.customEvents.on("gitEngineReady",(function(){i.trigger("commandSubmitted","mobile alert")})),r.hasOwnProperty("demo")?t=["git commit; git checkout -b bugFix C1; git commit; git merge master; git checkout master; git commit; git rebase bugFix;","delay 1000; reset;","level advanced1 --noFinishDialog --noStartCommand --noIntroDialog;","delay 2000; show goal; delay 1000; hide goal;","git checkout bugFix; git rebase master; git checkout side; git rebase bugFix;","git checkout another; git rebase side; git rebase another master;","help; levels"]:r.hasOwnProperty("hgdemo")?t=(t=['importTreeNow {"branches":{"master":{"target":"C3","id":"master"},"feature":{"target":"C2","id":"feature"},"debug":{"target":"C4","id":"debug"}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"},"C2":{"parents":["C1"],"id":"C2"},"C3":{"parents":["C1"],"id":"C3"},"C4":{"parents":["C2"],"id":"C4"}},"HEAD":{"target":"feature","id":"HEAD"}}',"delay 1000","git rebase master","delay 1000","undo","hg book","delay 1000","hg rebase -d master"]).join(";#").split("#"):r.hasOwnProperty("hgdemo2")?t=(t=['importTreeNow {"branches":{"master":{"target":"C3","id":"master"},"feature":{"target":"C2","id":"feature"},"debug":{"target":"C4","id":"debug"}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"},"C2":{"parents":["C1"],"id":"C2"},"C3":{"parents":["C1"],"id":"C3"},"C4":{"parents":["C2"],"id":"C4"}},"HEAD":{"target":"debug","id":"HEAD"}}',"delay 1000","git rebase master","delay 1000","undo","hg sum","delay 1000","hg rebase -d master"]).join(";#").split("#"):r.hasOwnProperty("remoteDemo")?t=(t=["git clone","git commit","git fakeTeamwork","git pull","git push","git commit","git fakeTeamwork","git pull --rebase","git push","levels"]).join(";#").split("#"):r.gist_level_id?$.ajax({url:"https://api.github.com/gists/"+r.gist_level_id,type:"GET",dataType:"jsonp",success:function(e){var t=(e.data||{}).files||{};if(Object.keys(t).length){var o=t[Object.keys(t)[0]];o.content||console.warn("file empty"),i.trigger("commandSubmitted","importLevelNow "+escape(o.content)+"; clear")}else console.warn("no files found")}}):r.hasOwnProperty("NODEMO")||(t=["help;","levels"]),r.hasOwnProperty("STARTREACT"),t&&e.mainVis.customEvents.on("gitEngineReady",(function(){i.trigger("commandSubmitted",t.join(""))})),void 0!==r.locale&&r.locale.length?p.changeLocaleFromURI(r.locale):(o=navigator.language||navigator.browserLanguage,p.changeLocaleFromHeader(o)),n=h.getSupportedLocales().map((function(e){return'<link rel="alternate" hreflang="'+e+'" href="https://learngitbranching.js.org/?locale='+e+'" />'})),a="https://learngitbranching.js.org/?locale="+h.getDefaultLocale(),n.push('<link rel="alternate" hreflang="x-default" href="'+a+'" />'),$("head").prepend(n),r.command){var s=unescape(r.command);e.mainVis.customEvents.on("gitEngineReady",(function(){i.trigger("commandSubmitted",s)}))}};function k(){s.$=$;e("../views");var t=e("../models/collections"),o=e("../views/commandViews"),n=e("../react_views/CommandHistoryView.jsx"),a=e("../react_views/MainHelperBarView.jsx");this.commandCollection=new t.CommandCollection,this.commandBuffer=new t.CommandBuffer({collection:this.commandCollection}),this.commandPromptView=new o.CommandPromptView({el:$("#commandLineBar")}),l.render(m.createElement(a),document.getElementById("helperBarMount")),l.render(m.createElement(n,{commandCollection:this.commandCollection}),document.getElementById("commandDisplay"))}e("../util").isBrowser()&&$(document).ready(f),o.getEvents=function(){return g},o.getSandbox=function(){return a},o.getEventBaton=function(){return i},o.getCommandUI=function(){return n},o.getLevelDropdown=function(){return r},o.init=f},{"../actions/LocaleActions":43,"../intl":59,"../models/collections":67,"../react_views/CommandHistoryView.jsx":69,"../react_views/MainHelperBarView.jsx":75,"../sandbox/":77,"../stores/LocaleStore":81,"../util":88,"../util/eventBaton":87,"../views":98,"../views/commandViews":96,"../views/levelDropdownView":99,backbone:1,events:4,react:28,"react-dom":22}],45:[function(e,t,o){var n=e("../intl"),a=e("../util/errors"),i=e("../git/commands"),r=e("../mercurial/commands"),s=a.CommandProcessError,c=(a.CommandResult,{git:i.commandConfig,hg:r.commandConfig}),m={execute:function(e,t,o,n){if(!c[e][t])throw new Error("i don't have a command for "+t);var a=c[e][t];if(a.delegate)return this.delegateExecute(a,o,n);a.execute.call(this,o,n)},delegateExecute:function(e,t,o){var n=e.delegate.call(this,t,o);n.multiDelegate?n.multiDelegate.forEach((function(e){o.setOptionsMap(e.options||{}),o.setGeneralArgs(e.args||[]),c[e.vcs][e.name].execute.call(this,t,o)}),this):(e=c[n.vcs][n.name],c[n.vcs][n.name].execute.call(this,t,o))},blankMap:function(){return{git:{},hg:{}}},getShortcutMap:function(){var e=this.blankMap();return this.loop((function(t,o,n){t.sc&&(e[n][o]=t.sc)}),this),e},getOptionMap:function(){var e=this.blankMap();return this.loop((function(t,o,n){var a=t.displayName||o,i={};(t.options||[]).forEach((function(e){i[e]=!1})),e[n][a]=i})),e},getRegexMap:function(){var e=this.blankMap();return this.loop((function(t,o,n){var a=t.displayName||o;e[n][a]=t.regex})),e},getCommandsThatCount:function(){var e=this.blankMap();return this.loop((function(t,o,n){t.dontCountForGolf||(e[n][o]=t.regex)})),e},loop:function(e,t){Object.keys(c).forEach((function(t){var o=c[t];Object.keys(o).forEach((function(n){var a=o[n];e(a,n,t)}))}))}};function l(e,t,o){if(this.vcs=e,this.method=t,this.rawOptions=o,this.supportedMap=m.getOptionMap()[e][t],void 0===this.supportedMap)throw new Error("No option map for "+t);this.generalArgs=[]}l.prototype.explodeAndSet=function(){for(var e=0;e<this.rawOptions.length;e++){var t=this.rawOptions[e];if("-"==t.slice(0,1)){if(void 0===this.supportedMap[t])return new s({msg:n.str("option-not-supported",{option:t})});var o=this.rawOptions[e+1],a=[];o&&"-"!==o.slice(0,1)&&(e++,a=[o]),this.supportedMap[t]=a}else this.generalArgs.push(t)}},o.commands=m,o.parse=function(e){var t,o,n,a=m.getRegexMap();if(Object.keys(a).forEach((function(i){var r=a[i];Object.keys(r).forEach((function(a){r[a].exec(e)&&(t=i,o=a,n=e.match(/('.*?'|".*?"|\S+)/g).slice(2))}))})),!o)return!1;var i=new l(t,o,n),r=i.explodeAndSet();return{toSet:{generalArgs:i.generalArgs,supportedMap:i.supportedMap,error:r,vcs:t,method:o,options:n,eventName:"processGitCommand"}}}},{"../git/commands":52,"../intl":59,"../mercurial/commands":66,"../util/errors":85}],46:[function(e,t,o){"use strict";var n=e("../util/keyMirror");t.exports={CHANGE_EVENT:"change",StoreSubscribePrototype:{subscribe:function(e){this.on("change",e)},unsubscribe:function(e){this.removeListener("change",e)}},ActionTypes:n({SET_LEVEL_SOLVED:null,RESET_LEVELS_SOLVED:null,CHANGE_IS_ANIMATING:null,CHANGE_FLIP_TREE_Y:null,SUBMIT_COMMAND:null,CHANGE_LOCALE:null,CHANGE_LOCALE_FROM_HEADER:null,SOLVE_LEVEL:null}),PayloadSources:n({VIEW_ACTION:null,URI_ACTION:null})}},{"../util/keyMirror":89}],47:[function(e,t,o){o.dialog={en_US:[{type:"ModalAlert",options:{markdowns:["## Are you sure you want to see the solution?","","I believe in you! You can do it"]}}],de_DE:[{type:"ModalAlert",options:{markdowns:["## Bist du sicher, dass du die Auflösung sehen willst?","","Ich glaube an dich! Du schaffst das!"]}}],zh_CN:[{type:"ModalAlert",options:{markdowns:["## 确定要看答案吗？","","相信自己，你可以的！"]}}],zh_TW:[{type:"ModalAlert",options:{markdowns:["## 確定偷看解答嗎？","","我相信你！你可以的"]}}],es_AR:[{type:"ModalAlert",options:{markdowns:["## ¿Estás seguro de que querés ver la solución?","","¡Creo en vos! ¡Dale que podés!"]}}],es_ES:[{type:"ModalAlert",options:{markdowns:["## ¿Estás seguro de que quieres ver la solución?","","¡Creo en ti! ¡Ánimo!"]}}],pt_BR:[{type:"ModalAlert",options:{markdowns:["## Tem certeza que quer ver a solução?","","Vamos lá, acredito que você consegue!"]}}],gl:[{type:"ModalAlert",options:{markdowns:["## ¿Queres ver a solución?","","Seguro que podes, ¡inténtao unha vez máis!"]}}],fr_FR:[{type:"ModalAlert",options:{markdowns:["## Êtes-vous sûr de vouloir voir la solution ?","","Je crois en vous ! Vous pouvez le faire !"]}}],ja:[{type:"ModalAlert",options:{markdowns:["## どうしても正解がみたいですか?","","頑張れ頑張れできるできる絶対できる頑張れもっとやれるって","","やれる気持ちの問題だ頑張れ頑張れそこだ！","","そこで諦めるな絶対に頑張れ積極的にポジティブに頑張る頑張る","","北京だって頑張ってるんだから！"]}}],ru_RU:[{type:"ModalAlert",options:{markdowns:["## Уверен, что хочешь посмотреть решение?","","Мы верим в тебя! Не прыгай! Ты сможешь!"]}}],uk:[{type:"ModalAlert",options:{markdowns:["## Впевнений, що хочеш побачити розв’язок?","","Я вірю в тебе! Ти впораєшся!"]}}],vi:[{type:"ModalAlert",options:{markdowns:["## Bạn chắc là muốn xem đáp án chứ?","","Tôi tin ở bạn! Bạn có thể làm được!"]}}]}},{}],48:[function(e,t,o){o.dialog={en_US:[{type:"ModalAlert",options:{markdowns:["## Welcome to the level builder!","","Here are the main steps:","","  * Set up the initial environment with git commands","  * Define the starting tree with ```define start```","  * Enter the series of git commands that compose the (optimal) solution","  * Define the goal tree with ```define goal```. Defining the goal also defines the solution","  * Optionally define a hint with ```define hint```","  * Edit the name with ```define name```","  * Optionally define a nice start dialog with ```edit dialog```","  * Enter the command ```finish``` to output your level JSON!"]}}],de_DE:[{type:"ModalAlert",options:{markdowns:["## Willkommen zum Level-Editor!","","So funktioniert's:","","  * Stelle mit Git-Befehlen die Ausganssituation her","  * Leg den Startpunkt mit ```define start``` fest","  * Gib eine Abfolge von Git-Befehlen ein, welche die (optimale) Lösung darstellen","  * Leg den Ziel-Baum mit ```define goal``` fest. Damit markierst du den Endpunkt der Lösung","  * Gib einen Hinweis mittels ```define hint``` an, wenn du willst","  * Änder den Namen mittels ```define name```","  * Wenn du magst, erstelle einen schönene Einführungsdialog mit ```edit dialog```","  * Gib das Kommando ```finish``` ein um deinen Level als JSON auszugeben"]}}],zh_CN:[{type:"ModalAlert",options:{markdowns:["## 欢迎使用关卡生成器！","","关键步骤如下：","","  * 用 Git 命令建立初始环境","  * 用 ```define start``` 命令定义初始提交树","  * 输入一系列 Git 命令作为（最佳）答案","  * 用 ```define goal``` 命令定义目标提交树。定义目标的同时也定义了答案","  * （选做）还可以用 ```define hint``` 命令定义提示","  * 用 ```define name``` 命令设置关卡名称","  * （选做）还可以用 ```edit dialog``` 定义一个漂亮的开始对话框","  * 用 ```finish``` 命令就可以输出你的关卡的JSON数据了！"]}}],zh_TW:[{type:"ModalAlert",options:{markdowns:["## 歡迎使用關卡編輯器！","","主要步驟如下：","","  * 使用 git 指令建立初始環境","  * 使用 ```define start``` 指令定義起始樹","  * 輸入一系列 git 命令，編好答案","  * 使用 ```define goal``` 指令定義目標樹。定義目標的同時定義答案","  * 還可以用 ```define hint``` 指令定義一個提示","  * 用 ```define name``` 修改名稱","  * 還可以用 ```edit dialog``` 定義一個漂亮的開始對話視窗","  * 輸入 ```finish``` 即可將您的關卡輸出為 JSON！"]}}],es_AR:[{type:"ModalAlert",options:{markdowns:["## ¡Bienvenido al constructor de niveles!","","Estos son los pasos principales:","","  * Prepará el entorno inicial usando comandos de Git","  * Definí el árbol inicial con ```define start```","  * Ingresá la serie de comandos de git que representan la solución óptima","  * Definí el árbol objetivo con ```define goal```. El objetivo también determina la solución","  * Opcionalmente, definí pistas con ```define hint```","  * Dale un nombre con ```define name```","  * Opcionalmente, definí un mensaje inicial con ```edit dialog```","  * ¡Ingresá el comando ```finish``` para obtener tu nivel en formato JSON!"]}}],es_ES:[{type:"ModalAlert",options:{markdowns:["## ¡Bienvenido al constructor de niveles!","","Estos son los pasos principales:","","  * Prepara el entorno inicial usando comandos de Git","  * Define el árbol inicial con ```define start```","  * Introduce la serie de comandos de git que representan la solución óptima","  * Crea el árbol objetivo con ```define goal```. El objetivo también determina la solución","  * Opcionalmente, crea pistas con ```define hint```","  * Dale un nombre con ```define name```","  * Opcionalmente, crea un mensaje inicial con ```edit dialog```","  * ¡Introduce el comando ```finish``` para obtener tu nivel en formato JSON!"]}}],pt_BR:[{type:"ModalAlert",options:{markdowns:["## Bem-vindo ao construtor de níveis!","","Estes são os passos principais:","","  * Prepare o ambiente inicial usando comandos do Git","  * Define a árvore inicial com ```define start```","  * Insira a série de comandos do git que representam a solução ótima","  * Defina a árvore objetivo com ```define goal```. O objetivo também determina a solução","  * Opcionalmente, defina dicas com ```define hint```","  * Dê um nome com ```define name```","  * Opcionalmente, defina uma mensagem inicial com ```edit dialog```","  * Digite o comando ```finish``` para obter seu nível em formato JSON!"]}}],gl:[{type:"ModalAlert",options:{markdowns:["## Benvido ó constructor de niveis!","","Estes son os pasos principais:","","  * Prepara o eido inicial usando comandos de Git","  * Define a árbore inicial con ```define start```","  * Inserta a secuencia de comandos de git que representan a mellor solución","  * Define a árbore obxectivo con ```define goal```. O obxectivo tamén determina a solución","  * Opcionalmente, define axudas con ```define hint```","  * Dalle un nome con ```define name```","  * Opcionalmente, define unha mensaxe inicial con ```edit dialog```","  * Escribe o comando ```finish``` para obter seu nivel en formato JSON!"]}}],fr_FR:[{type:"ModalAlert",options:{markdowns:["## Bienvenue dans l'éditeur niveaux !","","Voici les étapes principales :","","  * Mettez en place l'environnement initial avec des commandes git","  * Définissez l'arbre de départ avec ```define start```","  * Saisissez la série de commandes git qui composent la solution (optimale)","  * Définissez l'arbre cible avec ```define goal```. Cela définit aussi la solution","  * Optionnellement, définissez un indice avec ```define hint```","  * Changez le nom avec ```define name```","  * Optionellement, definissez un joli dialogue de départ avec ```edit dialog```","  * Entrez la commande ```finish``` pour délivrer votre niveau JSON!"]}}],ja:[{type:"ModalAlert",options:{markdowns:["## Levelエディタへようこそ!","","ここでは、以下の主にステップを踏みます:","","  * Gitコマンドで初期設定をします","  * ```define start```で開始時のコミットツリーを定義します","  * 一連のGitコマンドの（最適な）解答を入力します","  * ```define goal```でゴールのコミットツリーを定義します（ゴールを定義するということは、解答を定義するということでもあります）","  * オプションで```define hint```でヒントを定義します","  * ```define name```で名前を編集します","  * オプションで```edit dialog```で良い感じに開始時のダイアログを定義します","  * ```finish```コマンドを打つことであなたのlevelがJSONで出力されます","","*Note: このダイアログは`help builder`で何回でも表示できます！活用してください！*"]}}],ru_RU:[{type:"ModalAlert",options:{markdowns:["## Добро пожаловать в конструктор уровней!","","Вот основные шаги:","","  * Настроить стартовое дерево при помощи команд git","  * Обозначить старовое дерево при помощи ```define start```",'  * Ввести команды "оптимального" решения уровня',"  * Обозначить цель уровня при помощи ```define goal```. Одновременно обозначится решение.","  * По желанию, можно указать подсказку при помощи ```define hint```","  * Указать название уровня при помощи ```define name```","  * По желанию, указать стартовое сообщение при помощи ```edit dialog```","  * Ввести ```finish``` и получить JSON с описанием уровня!"]}}],uk:[{type:"ModalAlert",options:{markdowns:["## Ласкаво просимо до конструктора рівнів!","","Ось основні кроки:","","  * Налаштувати початкове середовище за допомогою команд git","  * Визначити стартове дерево за допомогою ```define start```","  * Ввести набір команд, що описують (оптимальний) розв’язок","  * Визначити кінцеве дерево за допомогою ```define goal```. Одночасно це визначить розв’язок","  * Додатково можна задати підказку за допомогою ```define hint```","  * Редагувати назву рівня за допомогою ```define name```","  * Додатково можна вказати файний початковий діалог за допомогою ```edit dialog```","  * Ввести команду ```finish``` й отримати JSON з описом рівня!"]}}],ko:[{type:"ModalAlert",options:{markdowns:["## 레벨 생성기 입니다. 환영합니다!","","Here are the main steps:","","  * git 명령어로 초기 환경을 만들어주세요","  * 시작 트리를 ```define start```로 정의하세요","  * (최적화된)정답을 만드는 git 명령어들을 입력하세요","  * 골 트리를 ```define goal```로 정의해주세요. 골을 정의하면 정답도 같이 정의됩니다","  * ```define hint```로 원하면 힌트도 정의해줄수 있습니다","  * 문제의 이름을 ```define name```로 수정하세요","  * 시작 글이 필요하다면 ```edit dialog```로 쓸 수 있습니다","  * ```finish```로 여러분의 레벨을 JSON결과로 받을 수 있습니다!"]}}],vi:[{type:"ModalAlert",options:{markdowns:["## Chào mừng đến trình tạo cấp độ!","","Có những bước chính sau:","","  * Khởi tạo môi trường với các lệnh git","  * Định nghĩa cây để bắt đầu với ```define start```","  * Nhập chuỗi lệnh git để tạo đáp án (tốt nhất) của bạn","  * Định nghĩa cây mục tiêu với ```define goal```. Định nghĩa mục tiêu đồng thời cũng xác định đáp án","  * Có thể định nghĩa gợi ý với ```define hint```","  * Chỉnh sửa tên với ```define name```","  * Có thể định nghĩa hội thoại bắt đầu với ```edit dialog```","  * Nhập lệnh ```finish``` xuất cấp độ của bạn dưới dạng JSON!"]}}]}},{}],49:[function(e,t,o){o.dialog={en_US:[{type:"ModalAlert",options:{markdowns:["## Great Job!!","","You solved the level in *{numCommands}* command(s); ","our solution uses {best}."]}}],de_DE:[{type:"ModalAlert",options:{markdowns:["## Super gemacht","","Du hast den Level in *{numCommands}* Befehl(en) gelöst;","meine Lösung besteht aus {best}."]}}],ja:[{type:"ModalAlert",options:{markdowns:["## 完成!","","あなたは*{numCommands}*回のコマンドでこの課題をクリアしました; ","模範解答では{best}回です。","","模範解答は、右下の`?`メニューの`Solution`から見ることができます。"]}}],zh_CN:[{type:"ModalAlert",options:{markdowns:["## 好样的！","","你用 *{numCommands}* 条命令通过了这一关；","我们的答案要用 {best} 条命令。"]}}],zh_TW:[{type:"ModalAlert",options:{markdowns:["## 太棒了！","","您用了 *{numCommands}* 個指令完成這一關，","我們的解答用了 {best} 個。"]}}],es_AR:[{type:"ModalAlert",options:{markdowns:["## ¡Buen trabajo!","","Resolviste el nivel en *{numCommands}* comandos; ","nuestra mejor solución usa {best}."]}}],es_ES:[{type:"ModalAlert",options:{markdowns:["## ¡Buen trabajo!","","Resolviste el nivel en *{numCommands}* comandos; ","nuestra mejor solución usa {best}."]}}],pt_BR:[{type:"ModalAlert",options:{markdowns:["## Bom trabalho!!","","Você resolveu o nível usando *{numCommands}* comandos; ","nossa melhor solução usa {best}."]}}],gl:[{type:"ModalAlert",options:{markdowns:["## Bo traballo!!","","Resolviches o nivel empregando *{numCommands}* comandos; ","a nosa mellor solución é en {best}."]}}],fr_FR:[{type:"ModalAlert",options:{markdowns:["## Beau Travail!!","","Vous avez résolu le niveau en *{numCommands}* commande(s); ","notre solution le fait en {best}."]}}],ru_RU:[{type:"ModalAlert",options:{markdowns:["## Супер!","","Ты прошёл уровень. Количество использованных команд - *{numCommands}* ; ","а наше решение состоит из {best}."]}}],uk:[{type:"ModalAlert",options:{markdowns:["## Молодець!","","Ти пройшов рівень. Кількість використаних команд — *{numCommands}*; ","наш розв’язок складається з {best}."]}}],ko:[{type:"ModalAlert",options:{markdowns:["## 훌륭합니다!!","","*{numCommands}*개의 명렁으로 레벨을 통과했습니다; ","모범 답안은 {best}개를 사용합니다."]}}],vi:[{type:"ModalAlert",options:{markdowns:["## Làm tốt lắm!!","","Bạn hoàn thành cấp độ này với *{numCommands}* câu lệnh; ","Đáp án của chúng tôi sử dụng {best}."]}}]}},{}],50:[function(e,t,o){o.dialog={en_US:[{type:"ModalAlert",options:{markdowns:["## Welcome to Learn Git Branching","","Interested in learning Git? Well you've come to the right place! ",'"Learn Git Branching" is the most visual and interactive way to learn Git ',"on the web; you'll be challenged with exciting levels, given step-by-step ","demonstrations of powerful features, and maybe even have a bit of fun along the way.","","After this dialog you'll see the variety of levels we have to offer. If you're a ","beginner, just go ahead and start with the first. If you already know some Git basics, ","try some of our later more challenging levels.","","You can see all the commands available with `show commands` at the terminal.","","PS: Want to go straight to a sandbox next time?","Try out ","[this special link](https://pcottle.github.io/learnGitBranching/?NODEMO)"]}}],es_AR:[{type:"ModalAlert",options:{markdowns:["## ¡Bienvenid@ a Learn Git Branching!","","Esta aplicación está diseñada para ayudar a los principantes ","a manejar los poderosos conceptos que hay detrás del trabajo ","con ramas (branches) en Git. Esperamos que disfrutes la aplicación ","y tal vez incluso ¡que aprendas algo! ","","# ¡Demo!","","Si no viste la demo, mirala en esta dirección:","","[https://pcottle.github.io/learnGitBranching/?demo](https://pcottle.github.io/learnGitBranching/?demo)","","¿Harto de este mensaje? Agregale `?NODEMO` a la URL para dejar de verlo, como en este link:","","[https://pcottle.github.io/learnGitBranching/?NODEMO](?NODEMO)"]}},{type:"ModalAlert",options:{markdowns:["## Comandos de Git","","Tenés una gran variedad de comandos de git en este sandbox. Estos incluyen: ",""," * commit"," * branch"," * checkout"," * cherry-pick"," * reset"," * revert"," * rebase"," * merge"]}},{type:"ModalAlert",options:{markdowns:["## ¡Compartí!","","Compartí tus árboles con tus amigos usando `export tree` e `import tree`","","¿Tenés una buena lección que compartir? Probá construyendo un nivel con `build level` o probá el nivel de un amigo con `import level`","","Para ver todos los comandos disponibles, probá `show commands`. Hay algunas joyitas como `undo` y `reset`","","Por ahora, arranquemos con los `levels`..."]}}],es_ES:[{type:"ModalAlert",options:{markdowns:["## ¡Bienvenid@ a Learn Git Branching!","","Esta aplicación está diseñada para ayudar a los principantes ","a manejar los poderosos conceptos que hay detrás del trabajo ","con ramas (branches) en Git. Esperamos que disfrutes la aplicación ","y tal vez incluso ¡que aprendas algo! ","","# ¡Demo!","","Si no viste la demo, mírala en esta dirección:","","[https://pcottle.github.io/learnGitBranching/?demo](https://pcottle.github.io/learnGitBranching/?demo)","","¿Harto de este mensaje? Agrégale `?NODEMO` a la URL para dejar de verlo, como en este link:","","[https://pcottle.github.io/learnGitBranching/?NODEMO](?NODEMO)"]}},{type:"ModalAlert",options:{markdowns:["## Comandos de Git","","Tienes una gran variedad de comandos de git en este sandbox. Estos incluyen: ",""," * commit"," * branch"," * checkout"," * cherry-pick"," * reset"," * revert"," * rebase"," * merge"]}},{type:"ModalAlert",options:{markdowns:["## ¡Comparte!","","Comparte tus árboles con tus amigos usando `export tree` e `import tree`","","¿Tienes una buena lección que compartir? Prueba construyendo un nivel con `build level` o prueba el nivel de un amigo con `import level`","","Para ver todos los comandos disponibles, escribe `show commands`. Hay algunas joyitas como `undo` y `reset`","","Por ahora, empecemos con los `levels`..."]}}],pt_BR:[{type:"ModalAlert",options:{markdowns:["## Bem-vindo ao Learn Git Branching!","","Este aplicativo foi desenvolvido para ajudar os iniciantes a ","aprender os poderosos conceitos por trás do branching com ","o git. Esperamos que você goste deste aplicativo e talvez ","até aprenda alguma coisa!","","# Demo!","","Se você ainda não viu o demo, veja aqui:","","[https://pcottle.github.io/learnGitBranching/?demo](https://pcottle.github.io/learnGitBranching/?demo)","","Farto desta mensagem? Acrescente `?NODEMO` ao endereço para se livrar dela, como no link abaixo:","","[https://pcottle.github.io/learnGitBranching/?NODEMO](?NODEMO)"]}},{type:"ModalAlert",options:{markdowns:["## Comandos do git","","Você tem à sua disposição no sandbox uma variedade de comandos do git:",""," * commit"," * branch"," * checkout"," * cherry-pick"," * reset"," * revert"," * rebase"," * merge"]}},{type:"ModalAlert",options:{markdowns:["## Compartilhar é se importar!","","Compartilhe árvores com seus amigos usando `export tree` e `import tree`","","Tem uma grande lição para compartilhar? Tente construir um nível com `build level` ou experimente o nível de um amigo com `import level`","","Para ver todos os comandos, use `show commands`. Há algumas jóias como `undo` e `reset`","","Por hora, vamos começar com o `levels`..."]}}],gl:[{type:"ModalAlert",options:{markdowns:["## Benvido a Learn Git Branching!","","Esta aplicación foi desenvolvida para axudar os iniciados en git a ","aprender os poderosos conceptos que hai por detrás do branching con "," git. Agardamos que disfrutes desta aplicación, e tal vez, ","ata aprendas algunha cousa!","","# Demostracións!","","Se aínda non viches a demo, olla aquí:","","[https://pcottle.github.io/learnGitBranching/?demo](https://pcottle.github.io/learnGitBranching/?demo)","","¿Farto destas mensaxes? Engade `?NODEMO` á dirección para librarte dela, como no link de abaixo:","","[https://pcottle.github.io/learnGitBranching/?NODEMO](?NODEMO)"]}},{type:"ModalAlert",options:{markdowns:["## Comandos de git","","Tes a túa disposición unha caixa de área con unha variedade de comandos de git:",""," * commit"," * branch"," * checkout"," * cherry-pick"," * reset"," * revert"," * rebase"," * merge"]}},{type:"ModalAlert",options:{markdowns:["## Compartir e importar!","","Comparte árbores cos seus amigas con `export tree` e `import tree`","","¿Tes un enlace moi grande para compartir? Intenta construír un nivel con `build level` ou importe o nivel dun amigo con `import level`","","Para ver tódolos comandos, usa `show commands`. Hai algunha xoia como `undo` e `reset`","","Por agora, imos comezar cos `levels`..."]}}],de_DE:[{type:"ModalAlert",options:{markdowns:["## Willkommen bei Learn Git Branching!","","Der Sinn dieser Anwendung ist, die umfangreichen und komplexen Zusammenhänge der Prozesse, die bei der Arbeit mit Git ablaufen, zu verdeutlichen. Ich hoffe du hast Spaß dabei und lernst vielleicht sogar etwas!","","# Demo!","","Falls du die Demonstration noch nicht gesehen hast, schau sie dir hier an:","","[https://pcottle.github.io/learnGitBranching/?demo](https://pcottle.github.io/learnGitBranching/?demo)","","Genervt von diesem Fenster? Häng `?NODEMO` an die URL um es los zu werden, so wie hier:","","[https://pcottle.github.io/learnGitBranching/?NODEMO](?NODEMO)"]}},{type:"ModalAlert",options:{markdowns:["## Git-Kommandos","","Dir steht eine große Zahl von Git-Befehlen im Sandkasten-Modus zur Verfügung. Unter anderem",""," * commit"," * branch"," * checkout"," * cherry-pick"," * reset"," * revert"," * rebase"," * merge"]}},{type:"ModalAlert",options:{markdowns:["## Teilen macht Spaß!","","Teile diese Git-Bäume mit deinen Freunden mittels `export tree` und `import tree`.","","Hast du Wissenswertes zu Git zu vermitteln? Versuch einen Level mit `build level` zu bauen oder probier den Level eines Freundes mit `import level` aus.","","Um alle Kommandos zu sehen, gib `show commands` ein. Darunter gibt's kleine Schätze wie `undo` und `reset`.","","Für's Erste lass uns mit `levels` anfangen ..."]}}],ja:[{type:"ModalAlert",options:{markdowns:["## Learn Git Branchingへようこそ","","gitのパワフルなブランチ機能のコンセプトが ","学びやすくなるようにこのアプリケーションを作りました。 ","このアプリケーションを楽しんで使って頂いて、 ","何かを学習して頂けたなら嬉しいです。","","# とりあえず触ってみたい方へ：","","簡単なデモを用意してあるので、もしよければこちらもご覧ください：","","[https://pcottle.github.io/learnGitBranching/?demo](https://pcottle.github.io/learnGitBranching/?demo&locale=ja)","","このダイアログ自体を省略するには、以下のようにURLの末尾にクエリストリング`?NODEMO`を付加してアクセスしてください。","","[https://pcottle.github.io/learnGitBranching/?NODEMO](https://pcottle.github.io/learnGitBranching/?NODEMO&locale=ja)"]}},{type:"ModalAlert",options:{markdowns:["## ここで学べるGitのオペレーション","","ここでは、下記の種類のgitコマンドを学ぶことができます。",""," * commit"," * branch"," * checkout"," * cherry-pick"," * reset"," * revert"," * rebase"," * merge"]}},{type:"ModalAlert",options:{markdowns:["## 学習した内容を共有できます","","画面左のコマンドプロンプトから`export tree`や`import tree`とタイプすることで、gitのツリー構造を友達に送ることができます","","何か教材になるようなケースはご存知ないでしょうか。`build level`で課題を作成したり、`import level`で他の人の課題に挑戦してみてください。","","何か詰まったことがあったら、右下メニューの?ボタンを押してみてください","","それから、不自然な記号が出てきたときは顔を左方向に傾けてみるといいかもしれません :P（ペロッ）","","それでは教材の選択画面に進んでみることにします。","","（なお、日本語版製作者のフォークサイトは[こちら](https://remore.github.io/learnGitBranching-ja/)になります。）"]}}],zh_CN:[{type:"ModalAlert",options:{markdowns:["## 欢迎光临 Learn Git Branching","","你对 Git 感兴趣吗？那么算是来对地方了！","“Learning Git Branching” 可以说是目前为止最好的教程了，在沙盒里你能执行相应的命令，还能看到每个命令的执行情况；","通过一系列刺激的关卡挑战，逐步深入的学习 Git 的强大功能，在这个过程中你可能还会发现一些有意思的事情。","","关闭这个对话框以后，你会看到我们提供的许多关卡。如果你是初学者，从第一关开始逐个向后挑战就是了。","而如果你已经入门了，可以略过前面，直接挑战后面更有难度的关卡。","","### 演示","","如果你还没看过演示，请[到此](?demo)查看。","","PS：想直接进入沙盒？ 在 URL 后头加上 `?NODEMO` 就可以了，试一下[这个链接](?NODEMO)："]}}],zh_TW:[{type:"ModalAlert",options:{markdowns:["## 歡迎光臨 Learn Git Branching!","","本應用旨在幫助初學者領會 git 分支背後的強大概念。","希望你能喜歡這個應用，並學到知識！","","# 演示！","","如果你還沒看過演示，請到此查看：","","[https://pcottle.github.io/learnGitBranching/?demo](https://pcottle.github.io/learnGitBranching/?demo)","","厭煩這個對話視窗嗎？在 URL 後頭加上 `?NODEMO` 就看不到它了，也可以直接點下邊這個連結：","","[https://pcottle.github.io/learnGitBranching/?NODEMO](https://pcottle.github.io/learnGitBranching/?NODEMO)"]}},{type:"ModalAlert",options:{markdowns:["## Git 命令","","在沙盒模式中，你有很多指令可用。包括：",""," * commit"," * branch"," * checkout"," * cherry-pick"," * reset"," * revert"," * rebase"," * merge"]}},{type:"ModalAlert",options:{markdowns:["## 分享即關懷","","使用 `export tree` 和 `import tree` 與朋友分享 Git 樹","","有個好課程可以分享？試試用 `build level` 創建一個關卡，或者 `import level` 試試朋友的。","","言歸正傳，讓我們先從 `levels` 開始……"]}}],ko:[{type:"ModalAlert",options:{markdowns:["## Git 브랜치 배우기를 시작합니다!","","이 애플리케이션은 git을 쓸 때 필요한 브랜치에 대한 개념을","탄탄히 잡게끔 도와드리기 위해 만들었습니다. 재밌게 사용해주시기를","바라며, 무언가를 배워가신다면 더 기쁘겠습니다!","","이 애플리케이션은 [Peter Cottle](https://github.io/pcottle)님의 [LearnGitBranching](https://pcottle.github.io/learnGitBranching/)를 번역한 것입니다.","아래 데모를 먼저 보셔도 좋습니다.","","<https://pcottle.github.io/learnGitBranching/?demo&locale=ko>"]}},{type:"ModalAlert",options:{markdowns:["## Git 명령어","","연습 모드에서 쓸 수 있는 다양한 git명령어는 다음과 같습니다",""," * commit"," * branch"," * checkout"," * cherry-pick"," * reset"," * revert"," * rebase"," * merge"]}},{type:"ModalAlert",options:{markdowns:["## 공유해주세요!","","`export tree` 와 `import tree`로 여러분의 친구들에게 트리를 공유해주세요","","훌륭한 학습 자료가 있으신가요? `build level`로 레벨을 만들어 보시거나, 친구의 레벨을 `import level`로 가져와서 실험해보세요","","이제 레슨을 시작해봅시다..."]}}],fr_FR:[{type:"ModalAlert",options:{markdowns:["## Bienvenue sur Learn Git Branching !","","Cette application a été conçue pour aider les débutants à saisir ","les puissants concepts derrière les branches en travaillant ","avec git. Nous espérons que vous apprécierez cette application et ","que vous apprendrez peut-être quelque chose d'intéressant !","","# Démo !","","Si vous n'avez pas vu la démo, vous pouvez le faire là :","","[https://pcottle.github.io/learnGitBranching/?demo](https://pcottle.github.io/learnGitBranching/?demo)","","Agacé par ce dialogue ? Ajoutez `?NODEMO` à l'URL pour le supprimer, en lien ci-dessous pour votre commodité :","","[https://pcottle.github.io/learnGitBranching/?NODEMO](?NODEMO)"]}},{type:"ModalAlert",options:{markdowns:["## Commandes Git","","Il existe une large variété de commandes git disponibles dans le mode bac à sable. Sont inclues :",""," * commit"," * branch"," * checkout"," * cherry-pick"," * reset"," * revert"," * rebase"," * merge"]}},{type:"ModalAlert",options:{markdowns:["## Partager, c'est se soucier !","","Partagez des arbres avec vos amis via `export tree` et `import tree`","","Vous avez une grande leçon à partager ? Essayez de construire un niveau avec `build level` ou essayez le niveau d'un ami avec `import level`","","Pour voir la gamme complète des commandes, tapez `show commands`. Il y a quelques perles telles que `undo` et `reset`","","Mais tout de suite commencez sur les `levels`…"]}}],ru_RU:[{type:"ModalAlert",options:{markdowns:["## Добро пожаловать в LearnGitBranching!","","Это приложение создано, чтобы помочь новичкам постичь ","мощные возможности ветвления и работы ","с git. Мы надеемся, что вам понравится эта игра ","и может вы что-то усвоите!","","# Демо!","","Если ты не видел демонстрацию – посмотри её тут:","","[https://pcottle.github.io/learnGitBranching/?demo](https://pcottle.github.io/learnGitBranching/?demo)","","Достало это сообщение? Добавь `?NODEMO` к адресу и навсегда забудь о нём, ниже ссылка для удобства:","","[https://pcottle.github.io/learnGitBranching/?NODEMO](?NODEMO)"]}},{type:"ModalAlert",options:{markdowns:["## Команды Git","","В нашей песочнице можно использовать множество команд:",""," * commit"," * branch"," * checkout"," * cherry-pick"," * reset"," * revert"," * rebase"," * merge"]}},{type:"ModalAlert",options:{markdowns:["## Бог велел – делись!","","Ты можешь делиться результатами с друзьями при помощи `export tree` и `import tree`","","Хочешь создать классный уровень? Сделай это при помощи `build level` или добавь уровень друга при помощи `import level`","","Команда `show commands` покажет все доступные инструкции. Там есть очень полезные, например `undo` и `reset`","","А пока просто начни игру при помощи `levels`..."]}}],uk:[{type:"ModalAlert",options:{markdowns:["## Ласкаво просимо до Learn Git Branching","","Хочеш вивчити Git? Тоді ти знайшов те, що шукав!",'"Learn Git Branching" — це найбільш візуальний та інтерактивний спосіб вивчення Git в Інтернеті. ',"Ти зможеш проходити захопливі рівні, дивитися ","покрокові інструкції з використання потужних функцій Git, навіть трохи ","розважитись в процесі навчання.","","Після цього діалогу побачиш список доступних рівнів. Якщо ти новачок, ","просто почни з першого рівня. Якщо вже знаєш основи Git, ","спробуй більш складні рівні в кінці.","","P.S. Хочеш перейти одразу до пісочниці наступного разу?","Спробуй ","[це спеціальне посилання.](https://pcottle.github.io/learnGitBranching/?NODEMO)"]}}],vi:[{type:"ModalAlert",options:{markdowns:["## Chào mừng đến với Học Nhánh Git","","Bạn có hứng thú học Git? Bạn đến đúng nơi rồi đấy! ",'"Học Nhánh Git" là cách trực quan và hiệu quả nhất để học Git trên web; ',"thông qua một loạt các thử thách cấp độ thú vị, bạn sẽ từng bước tìm hiểu sức mạnh của git","","Sau khi hội thoại này đóng lại, bạn sẽ thấy nhiều cấp độ mà chúng tôi cung cấp. ","Nếu bạn là người mới thì hãy bắt đầu từ bài đầu tiên. Nếu bạn đã có hiểu biết cơ bản về git, ","hãy thử những bài mang tính thách thức hơn phía sau.","","Bạn có thể dùng lệnh `show commands` để xem tất cả các lệnh hiện hữu.","","Ghi chú: Nếu muốn trực tiếp vào hộp cát ở lần sau?","Hãy dùng","[đường link đặc biệt này của chúng tôi](https://pcottle.github.io/learnGitBranching/?NODEMO)"]}}]}},{}],51:[function(e,t,o){"use strict";var n=e("../constants/AppConstants"),a=e("flux").Dispatcher,i=n.PayloadSources,r=new a;r.handleViewAction=function(e){this.dispatch({source:i.VIEW_ACTION,action:e})},r.handleURIAction=function(e){this.dispatch({source:i.URI_ACTION,action:e})},t.exports=r},{"../constants/AppConstants":46,flux:6}],52:[function(e,t,o){var n=e("../util/escapeString"),a=e("../intl"),i=e("../graph"),r=e("../util/errors"),s=(r.CommandProcessError,r.GitError),c=(r.Warning,r.CommandResult),m=function(e){return e.replace(/&#x27;/g,"'").replace(/&#x2F;/g,"/")};function l(e){return-1!==e.indexOf(":")&&2===e.split(":").length}var u=function(e,t){e.resolveID(t)},d=function(e,t){return e.validateBranchName(t)},h=function(e,t){return e.origin.validateBranchName(t)},p=function(e,t){return e.refs[t]?t:d(e,t)},g=function(e,t){if(e.refs[t]&&e.HEAD.get("target")===e.refs[t])throw new s({msg:a.todo("cannot fetch to "+t+" when checked out on "+t)})},f=function(e,t){u(e,t);var o=e.resolveID(t);if(!o||"branch"!==o.get("type"))throw new s({msg:a.todo(t+" is not a branch")})},b=function(e){if(e.length&&"origin"!==e[0])throw new s({msg:a.todo(e[0]+" is not a remote in your repository! try adding origin to that argument")})},v=function(e,t){if(t=m(t),!e.resolveID(t))throw new s({msg:a.todo(t+" is not a branch!")});var o=e.resolveID(t);if("branch"!==o.get("type"))throw new s({msg:a.todo(t+" is not a branch!")});var n=o.getRemoteTrackingBranchID();if(!n)throw new s({msg:a.todo(t+" is not a remote tracking branch! I don't know where to push")});return n},w={commit:{sc:/^(gc|git ci)($|\s)/,regex:/^git +commit($|\s)/,options:["--amend","-a","--all","-am","-m"],execute:function(e,t){var o=t.getOptionsMap();if(t.acceptNoGeneralArgs(),o["-am"]&&(o["-a"]||o["--all"]||o["-m"]))throw new s({msg:a.str("git-error-options")});var n=null,i=null;(o["-a"]||o["--all"])&&t.addWarning(a.str("git-warning-add")),o["-am"]&&(i=o["-am"],t.validateArgBounds(i,1,1,"-am"),n=i[0]),o["-m"]&&(i=o["-m"],t.validateArgBounds(i,1,1,"-m"),n=i[0]),o["--amend"]&&(i=o["--amend"],t.validateArgBounds(i,0,0,"--amend"));var r=e.commit({isAmend:!!o["--amend"]});n&&(n=n.replace(/&quot;/g,'"').replace(/^"/g,"").replace(/"$/g,""),r.set("commitMessage",n));var c=e.animationFactory.playCommitBirthPromiseAnimation(r,e.gitVisuals);e.animationQueue.thenFinish(c)}},cherrypick:{displayName:"cherry-pick",regex:/^git +cherry-pick($|\s)/,execute:function(e,t){t.getOptionsMap();var o=t.getGeneralArgs();t.validateArgBounds(o,1,Number.MAX_VALUE);var n=i.getUpstreamSet(e,"HEAD"),r=o.map((function(t){var o=e.getCommitFromRef(t);if(n[o.get("id")])throw new s({msg:a.str("git-error-already-exists",{commit:o.get("id")})});return o}),this);e.setupCherrypickChain(r)}},pull:{regex:/^git +pull($|\s)/,options:["--rebase"],execute:function(e,t){if(!e.hasOrigin())throw new s({msg:a.str("git-error-origin-required")});var o,n,i=t.getOptionsMap(),r=t.getGeneralArgs();t.twoArgsForOrigin(r),b(r);var c=r[1];if(c&&l(c)){var u=c.split(":");o=u[0],n=p(e,m(u[1])),g(e,n)}else if(c)o=c,f(e.origin,o),n=e.origin.refs[o].getPrefixedID();else{if(e.getDetachedHead())throw new s({msg:a.todo("Git pull can not be executed in detached HEAD mode if no remote branch specified!")});var d=e.getOneBeforeCommit("HEAD"),h=d.get("id");v(e,h),o=(n=d.getRemoteTrackingBranchID()).replace("o/","")}e.pull({source:o,destination:n,isRebase:!!i["--rebase"]})}},fakeTeamwork:{regex:/^git +fakeTeamwork($|\s)/,execute:function(e,t){var o,n,i=t.getGeneralArgs();if(!e.hasOrigin())throw new s({msg:a.str("git-error-origin-required")});switch(t.validateArgBounds(i,0,2),i.length){case 0:o="master",n=1;break;case 1:isNaN(parseInt(i[0],10))?(o=h(e,i[0]),n=1):(n=parseInt(i[0],10),o="master");break;case 2:if(o=h(e,i[0]),isNaN(parseInt(i[1],10)))throw new s({msg:"Bad numeric argument: "+i[1]});n=parseInt(i[1],10)}if("branch"!==e.origin.resolveID(o).get("type"))throw new s({msg:a.str("git-error-options")});e.fakeTeamwork(n,o)}},clone:{regex:/^git +clone *?$/,execute:function(e,t){t.acceptNoGeneralArgs(),e.makeOrigin(e.printTree())}},remote:{regex:/^git +remote($|\s)/,options:["-v"],execute:function(e,t){if(t.acceptNoGeneralArgs(),!e.hasOrigin())throw new c({msg:""});e.printRemotes({verbose:!!t.getOptionsMap()["-v"]})}},fetch:{regex:/^git +fetch($|\s)/,execute:function(e,t){if(!e.hasOrigin())throw new s({msg:a.str("git-error-origin-required")});var o,n,i=t.getGeneralArgs();t.twoArgsForOrigin(i),b(i);var r=i[1];if(r&&l(r)){var c=r.split(":");o=c[0],n=p(e,m(c[1])),g(e,n)}else r&&(o=r,f(e.origin,o),n=e.origin.refs[o].getPrefixedID());o&&u(e.origin,o),e.fetch({source:o,destination:n})}},branch:{sc:/^(gb|git br)($|\s)/,regex:/^git +branch($|\s)/,options:["-d","-D","-f","--force","-a","-r","-u","--contains"],execute:function(e,t){var o,n=t.getOptionsMap(),i=t.getGeneralArgs(),r=null;if(n["-d"]||n["-D"]){var c=n["-d"]||n["-D"];return c=c.concat(i),t.validateArgBounds(c,1,Number.MAX_VALUE,"-d"),void c.forEach((function(t){e.validateAndDeleteBranch(t)}))}if(n["-u"]){r=n["-u"].concat(i),t.validateArgBounds(r,1,2,"-u");var l=m(r[0]),d=r[1]||e.getOneBeforeCommit("HEAD").get("id");return function(e,t){u(e,t);var o=e.resolveID(t);if("branch"!==o.get("type")||!o.getIsRemote())throw new s({msg:a.todo(t+" is not a remote branch")})}(e,l),f(e,d),void e.setLocalToTrackRemote(e.refs[d],e.refs[l])}return n["--contains"]?(r=n["--contains"],t.validateArgBounds(r,1,1,"--contains"),void e.printBranchesWithout(r[0])):n["-f"]||n["--force"]?(r=(r=n["-f"]||n["--force"]).concat(i),t.twoArgsImpliedHead(r,"-f"),void e.forceBranch(r[0],r[1])):0===i.length?(o=n["-a"]?e.getBranches():n["-r"]?e.getRemoteBranches():e.getLocalBranches(),void e.printBranches(o)):(t.twoArgsImpliedHead(i),void e.branch(i[0],i[1]))}},add:{dontCountForGolf:!0,sc:/^ga($|\s)/,regex:/^git +add($|\s)/,execute:function(){throw new c({msg:a.str("git-error-staging")})}},reset:{regex:/^git +reset($|\s)/,options:["--hard","--soft"],execute:function(e,t){var o=t.getOptionsMap(),n=t.getGeneralArgs();if(o["--soft"])throw new s({msg:a.str("git-error-staging")});if(o["--hard"]&&(t.addWarning(a.str("git-warning-hard")),n=n.concat(o["--hard"])),t.validateArgBounds(n,1,1),e.getDetachedHead())throw new s({msg:a.str("git-error-reset-detached")});e.reset(n[0])}},revert:{regex:/^git +revert($|\s)/,execute:function(e,t){var o=t.getGeneralArgs();t.validateArgBounds(o,1,Number.MAX_VALUE),e.revert(o)}},merge:{regex:/^git +merge($|\s)/,options:["--no-ff"],execute:function(e,t){var o=t.getOptionsMap(),n=t.getGeneralArgs().concat(o["--no-ff"]||[]);t.validateArgBounds(n,1,1);var a=e.merge(n[0],{noFF:!!o["--no-ff"]});void 0!==a?e.animationFactory.genCommitBirthAnimation(e.animationQueue,a,e.gitVisuals):e.animationFactory.refreshTree(e.animationQueue,e.gitVisuals)}},revlist:{dontCountForGolf:!0,displayName:"rev-list",regex:/^git +rev-list($|\s)/,execute:function(e,t){var o=t.getGeneralArgs();t.validateArgBounds(o,1),e.revlist(o)}},log:{dontCountForGolf:!0,regex:/^git +log($|\s)/,execute:function(e,t){var o=t.getGeneralArgs();t.impliedHead(o,0),e.log(o)}},show:{dontCountForGolf:!0,regex:/^git +show($|\s)/,execute:function(e,t){var o=t.getGeneralArgs();t.oneArgImpliedHead(o),e.show(o[0])}},rebase:{sc:/^gr($|\s)/,options:["-i","--solution-ordering","--interactive-test","--aboveAll","-p","--preserve-merges"],regex:/^git +rebase($|\s)/,execute:function(e,t){var o=t.getOptionsMap(),n=t.getGeneralArgs();if(o["-i"]){var a=o["-i"].concat(n);return t.twoArgsImpliedHead(a," -i"),void(o["--interactive-test"]?e.rebaseInteractiveTest(a[0],a[1],{interactiveTest:o["--interactive-test"]}):e.rebaseInteractive(a[0],a[1],{aboveAll:!!o["--aboveAll"],initialCommitOrdering:o["--solution-ordering"]}))}t.twoArgsImpliedHead(n),e.rebase(n[0],n[1],{preserveMerges:o["-p"]||o["--preserve-merges"]})}},status:{dontCountForGolf:!0,sc:/^(gst|gs|git st)($|\s)/,regex:/^git +status($|\s)/,execute:function(e){e.status()}},checkout:{sc:/^(go|git co)($|\s)/,regex:/^git +checkout($|\s)/,options:["-b","-B","-"],execute:function(e,t){var o=t.getOptionsMap(),n=t.getGeneralArgs(),i=null;if(o["-b"]){i=o["-b"].concat(n),t.twoArgsImpliedHead(i,"-b");var r=e.validateBranchName(i[0]);return e.branch(r,i[1]),void e.checkout(r)}if(o["-"]){var c=e.HEAD.get("lastLastTarget");if(!c)throw new s({msg:a.str("git-result-nothing")});e.HEAD.set("target",c)}else{if(o["-B"])return i=o["-B"].concat(n),t.twoArgsImpliedHead(i,"-B"),e.forceBranch(i[0],i[1]),void e.checkout(i[0]);t.validateArgBounds(n,1,1),e.checkout(e.crappyUnescape(n[0]))}}},push:{regex:/^git +push($|\s)/,options:["--force"],execute:function(e,t){if(!e.hasOrigin())throw new s({msg:a.str("git-error-origin-required")});var o,n,i,r=t.getOptionsMap(),c=t.getGeneralArgs();t.twoArgsForOrigin(c),b(c);var m=c[1];if(m&&l(m)){var h=m.split(":");if(n=h[0],o=d(e,h[1]),""===n&&!e.origin.refs[o])throw new s({msg:a.todo("cannot delete branch "+{}.destination+" which doesnt exist")})}else if(m?(u(e,m),i=e.resolveID(m)):i=e.getOneBeforeCommit("HEAD"),n=i.get("id"),i.getRemoteTrackingBranchID&&i.getRemoteTrackingBranchID()){v(e,n);var p=i.getRemoteTrackingBranchID();o=e.refs[p].getBaseID()}else o=d(e,n);n&&u(e,n),e.push({destination:o,source:n,force:!!r["--force"]})}},describe:{regex:/^git +describe($|\s)/,execute:function(e,t){if(0===e.tagCollection.toArray().length)throw new s({msg:a.todo("fatal: No tags found, cannot describe anything.")});var o=t.getGeneralArgs();t.oneArgImpliedHead(o),u(e,o[0]),e.describe(o[0])}},tag:{regex:/^git +tag($|\s)/,options:["-d"],execute:function(e,t){var o=t.getGeneralArgs(),n=t.getOptionsMap();if(n["-d"]){var i,r=n["-d"];if(u(e,r),t.oneArgImpliedHead(r),e.tagCollection.each((function(e){e.get("id")==r&&(i=e)}),!0),null==i)throw new s({msg:a.todo("No tag found, nothing to remove")});return e.tagCollection.remove(i),delete e.refs[r],void e.gitVisuals.refreshTree()}if(0!==o.length)t.twoArgsImpliedHead(o),e.tag(o[0],o[1]);else{var c=e.getTags();e.printTags(c)}}}},y=[[/^(git help($|\s)|git$)/,function(){var t=[a.str("git-version"),"<br/>",a.str("git-usage"),n(a.str("git-usage-command")),"<br/>",a.str("git-supported-commands"),"<br/>"],o=e("../commands").commands.getOptionMap().git;Object.keys(o).forEach((function(e){var n=o[e];t.push("git "+e),Object.keys(n).forEach((function(e){t.push("\t "+e)}),this)}),this);var i=t.join("\n");throw i=i.replace(/\t/g,"&nbsp;&nbsp;&nbsp;"),new c({msg:i})}]];o.commandConfig=w,o.instantCommands=y},{"../commands":45,"../graph":56,"../intl":59,"../util/errors":85,"../util/escapeString":86}],53:[function(e,t,o){var n=e("q"),a=e("../app");e("../views/multiView").MultiView;function i(e){e=e||{},this.beforeCB=e.beforeCB||function(){},this.afterCB=e.afterCB||function(){};var t=function(e){e.resolve()};this.beforeDeferHandler=e.beforeDeferHandler||t,this.afterDeferHandler=e.afterDeferHandler||t,this.eventBaton=e.eventBaton||a.getEventBaton()}i.prototype.insertShim=function(){this.eventBaton.stealBaton("processGitCommand",this.processGitCommand,this)},i.prototype.removeShim=function(){this.eventBaton.releaseBaton("processGitCommand",this.processGitCommand,this)},i.prototype.processGitCommand=function(e,t){this.beforeCB(e);var o=n.defer();o.promise.then(function(){this.afterGitCommandProcessed(e,t)}.bind(this)).done();var a=function(){this.eventBaton.passBatonBack("processGitCommand",this.processGitCommand,this,[e,o])}.bind(this),i=n.defer();i.promise.then(a).done(),this.beforeDeferHandler(i,e)},i.prototype.afterGitCommandProcessed=function(e,t){this.afterCB(e);var o=n.defer();o.promise.then((function(){t.resolve()})).done(),this.afterDeferHandler(o,e)},o.GitShim=i},{"../app":44,"../views/multiView":100,q:19}],54:[function(e,t,o){e("backbone");var n=e("q"),a=e("../git").GitEngine,i=e("../visuals/animation/animationFactory").AnimationFactory,r=e("../visuals").GitVisuals,s=(e("../graph/treeCompare"),e("../util/eventBaton").EventBaton),c=e("../models/collections"),m=c.CommitCollection,l=c.BranchCollection,u=c.TagCollection,d=e("../models/commandModel").Command,h=e("../util/mock").mock,p=e("../util");var g=function(){this.init()};g.prototype.init=function(){this.commitCollection=new m,this.branchCollection=new l,this.tagCollection=new u;var e=function(){var e={},t=function(){var e=n.defer();return e.resolve(),e.promise};for(var o in i)e[o]=t;return e.playRefreshAnimationAndFinish=function(e,t){t.finish()},e.refreshTree=function(e,t){e.finish()},e.highlightEachWithPromise=function(e,t,o){return e},e}(),t=h(r),o={makeOrigin:function(e){e.localRepo;var t=e.treeString,o=new g;return o.gitEngine.loadTreeFromString(t),{customEvents:{on:function(e,t,o){t.apply(o,[])}},gitEngine:o.gitEngine}}};t.getVisualization=function(){return o},this.gitEngine=new a({collection:this.commitCollection,branches:this.branchCollection,tags:this.tagCollection,gitVisuals:t,animationFactory:e,eventBaton:new s}),this.gitEngine.init()};g.prototype.sendCommand=function(e,t){var o=n.defer(),a=o.promise,i=((new Date).getTime(),[]);return p.splitTextCommand(e,(function(e){a=a.then(function(){var t=new d({rawStr:e}),o=n.defer();return this.gitEngine.dispatch(t,o),i.push(t),o.promise}.bind(this))}),this),a.then((function(){(new Date).getTime();t&&t.resolve(i)})),a.fail((function(e){console.log("!!!!!!!! error !!!!!!!"),console.log(e),console.log(e.stack),console.log("!!!!!!!!!!!!!!!!!!!!!!")})),o.resolve(),a},o.HeadlessGit=g,o.getTreeQuick=function(e,t){var o=n.defer(),a=new g;a.sendCommand(e,o),o.promise.then((function(){t.resolve(a.gitEngine.exportTree())}))}},{"../git":55,"../graph/treeCompare":57,"../models/collections":67,"../models/commandModel":68,"../util":88,"../util/eventBaton":87,"../util/mock":91,"../visuals":104,"../visuals/animation/animationFactory":102,backbone:1,q:19}],55:[function(e,t,o){var n=e("backbone"),a=e("q"),i=e("../intl"),r=e("../visuals/animation/animationFactory").AnimationFactory,s=e("../visuals/animation").AnimationQueue,c=e("../graph/treeCompare"),m=e("../graph"),l=e("../util/errors"),u=e("../app"),d=e("../commands"),h=l.GitError,p=l.CommandResult,g="&nbsp;&nbsp;&nbsp;";function f(e){if("STAPH"!==e)throw e}function b(e){this.rootCommit=null,this.refs={},this.HEAD=null,this.origin=null,this.mode="git",this.localRepo=null,this.branchCollection=e.branches,this.tagCollection=e.tags,this.commitCollection=e.collection,this.gitVisuals=e.gitVisuals,this.eventBaton=e.eventBaton,this.eventBaton.stealBaton("processGitCommand",this.dispatch,this),this.animationFactory=e.animationFactory?e.animationFactory:r,this.initUniqueID()}b.prototype.initUniqueID=function(){var e;this.uniqueId=(e=0,function(t){return t?t+e++:e++})},b.prototype.handleModeChange=function(e,t){if(this.mode!==e){u.getEvents().trigger("vcsModeChange",{mode:e});var o=this.setMode(e);this.origin&&this.origin.setMode(e,(function(){})),o?o.then(t):t()}else t()},b.prototype.getIsHg=function(){return"hg"===this.mode},b.prototype.setMode=function(e){var t="git"===this.mode&&"hg"===e;if(this.mode=e,t){var o=a.defer();o.resolve();var n=o.promise;if(this.updateAllBranchesForHg())return n=(n=n.then(function(){return this.animationFactory.playRefreshAnimationSlow(this.gitVisuals)}.bind(this))).then(function(){if(this.pruneTree())return this.animationFactory.playRefreshAnimation(this.gitVisuals)}.bind(this));if(this.pruneTree())return this.animationFactory.playRefreshAnimation(this.gitVisuals)}},b.prototype.assignLocalRepo=function(e){this.localRepo=e},b.prototype.defaultInit=function(){var e=m.getDefaultTree();this.loadTree(e)},b.prototype.init=function(){this.rootCommit=this.makeCommit(null,null,{rootCommit:!0}),this.commitCollection.add(this.rootCommit);var e=this.makeBranch("master",this.rootCommit);this.HEAD=new v({id:"HEAD",target:e}),this.refs[this.HEAD.get("id")]=this.HEAD,this.commit()},b.prototype.hasOrigin=function(){return!!this.origin},b.prototype.isOrigin=function(){return!!this.localRepo},b.prototype.exportTreeForBranch=function(e){var t=this.exportTree(),o=m.getUpstreamSet(this,e),n=t.commits;t.commits={},n.forEach((function(e,n){o[n]&&(t.commits[n]=e)}));var a=t.branches;return t.branches={},a.forEach((function(o,n){n===e&&(t.branches[n]=o)})),t.HEAD.target=e,t},b.prototype.exportTree=function(){var e={branches:{},commits:{},tags:{},HEAD:null};this.branchCollection.toJSON().forEach((function(t){t.target=t.target.get("id"),delete t.visBranch,e.branches[t.id]=t})),this.commitCollection.toJSON().forEach((function(t){y.prototype.constants.circularFields.forEach((function(e){delete t[e]})),t.parents=(t.parents||[]).map((function(e){return e.get("id")})),e.commits[t.id]=t}),this),this.tagCollection.toJSON().forEach((function(t){delete t.visTag,t.target=t.target.get("id"),e.tags[t.id]=t}),this);var t=this.HEAD.toJSON();return t.lastTarget=t.lastLastTarget=t.visBranch=t.visTag=void 0,t.target=t.target.get("id"),e.HEAD=t,this.hasOrigin()&&(e.originTree=this.origin.exportTree()),e},b.prototype.printTree=function(e){e=e||this.exportTree(),c.reduceTreeFields([e]);var t=JSON.stringify(e);return/'/.test(t)&&(t=escape(t)),t},b.prototype.printAndCopyTree=function(){window.prompt(i.str("Copy the tree string below"),this.printTree())},b.prototype.loadTree=function(e){e=JSON.parse(JSON.stringify(e)),this.removeAll(),this.instantiateFromTree(e),this.reloadGraphics(),this.initUniqueID()},b.prototype.loadTreeFromString=function(e){this.loadTree(JSON.parse(unescape(this.crappyUnescape(e))))},b.prototype.instantiateFromTree=function(e){var t={};Object.values(e.commits).forEach((function(o){var n=this.getOrMakeRecursive(e,t,o.id,this.gitVisuals);this.commitCollection.add(n)}),this),Object.values(e.branches).forEach((function(o){var n=this.getOrMakeRecursive(e,t,o.id,this.gitVisuals);this.branchCollection.add(n,{silent:!0})}),this),Object.values(e.tags||{}).forEach((function(o){var n=this.getOrMakeRecursive(e,t,o.id,this.gitVisuals);this.tagCollection.add(n,{silent:!0})}),this);var o=this.getOrMakeRecursive(e,t,e.HEAD.id,this.gitVisuals);if(this.HEAD=o,this.rootCommit=t.C0,!this.rootCommit)throw new Error("Need root commit of C0 for calculations");if(this.refs=t,this.gitVisuals.gitReady=!1,this.branchCollection.each((function(e){this.gitVisuals.addBranch(e)}),this),this.tagCollection.each((function(e){this.gitVisuals.addTag(e)}),this),e.originTree){var n=JSON.stringify(e.originTree);this.animationQueue=this.animationQueue||new s({callback:function(){}}),this.makeOrigin(n)}},b.prototype.makeOrigin=function(e){if(this.hasOrigin())throw new h({msg:i.str("git-error-origin-exists")});e=e||this.printTree(this.exportTreeForBranch("master"));var t=this.gitVisuals.getVisualization().makeOrigin({localRepo:this,treeString:e});this.animationQueue.set("promiseBased",!0),t.customEvents.on("gitEngineReady",(function(){this.origin=t.gitEngine,t.gitEngine.assignLocalRepo(this),this.syncRemoteBranchFills(),this.origin.externalRefresh(),this.animationFactory.playRefreshAnimationAndFinish(this.gitVisuals,this.animationQueue)}),this);var o=JSON.parse(unescape(e));Object.keys(o.branches).forEach((function(e){var t=o.branches[e];if(!this.refs["o/"+e]){var n=this.findCommonAncestorWithRemote(t.target),a=this.makeBranch("o/"+e,this.getCommitFromRef(n));this.setLocalToTrackRemote(this.refs[t.id],a)}}),this)},b.prototype.makeRemoteBranchIfNeeded=function(e){if(!this.refs["o/"+e]&&"branch"===this.origin.resolveID(e).get("type"))return this.makeRemoteBranchForRemote(e)},b.prototype.makeBranchIfNeeded=function(e){if(!this.refs[e]){var t=this.findCommonAncestorForRemote(this.getCommitFromRef("HEAD").get("id"));return this.validateAndMakeBranch(e,this.getCommitFromRef(t))}},b.prototype.makeRemoteBranchForRemote=function(e){var t=this.origin.refs[e].get("target"),o=this.findCommonAncestorWithRemote(t.get("id"));return this.makeBranch("o/"+e,this.getCommitFromRef(o))},b.prototype.findCommonAncestorForRemote=function(e){if(this.origin.refs[e])return e;var t=this.refs[e].get("parents");if(1===t.length)return e=t[0].get("id"),this.findCommonAncestorForRemote(e);var o=this.findCommonAncestorForRemote(t[0].get("id")),n=this.findCommonAncestorForRemote(t[1].get("id"));return this.getCommonAncestor(o,n,!0).get("id")},b.prototype.findCommonAncestorWithRemote=function(e){if(this.refs[e])return e;var t=this.origin.refs[e].get("parents");if(1===t.length)return this.findCommonAncestorWithRemote(t[0].get("id"));var o=this.findCommonAncestorWithRemote(t[0].get("id")),n=this.findCommonAncestorWithRemote(t[1].get("id"));return this.getCommonAncestor(o,n,!0).get("id")},b.prototype.makeBranchOnOriginAndTrack=function(e,t){var o=this.makeBranch("o/"+e,this.getCommitFromRef(t));this.refs[e]&&this.setLocalToTrackRemote(this.refs[e],o);var n=this.findCommonAncestorForRemote(this.getCommitFromRef(t).get("id"));this.origin.makeBranch(e,this.origin.getCommitFromRef(n))},b.prototype.setLocalToTrackRemote=function(e,t){if(e.setRemoteTrackingBranchID(t.get("id")),this.command){var o='local branch "'+e.get("id")+'" set to track remote branch "'+t.get("id")+'"';this.command.addWarning(i.todo(o))}},b.prototype.getOrMakeRecursive=function(e,t,o,n){if(t[o])return t[o];var a=function(e,t){if(e.commits[t])return"commit";if(e.branches[t])return"branch";if("HEAD"==t)return"HEAD";if(e.tags[t])return"tag";throw new Error("bad type for "+t)}(e,o);if("HEAD"==a){var i=e.HEAD,r=new v(Object.assign(e.HEAD,{target:this.getOrMakeRecursive(e,t,i.target)}));return t[o]=r,r}if("branch"==a){var s=e.branches[o],c=new w(Object.assign(e.branches[o],{target:this.getOrMakeRecursive(e,t,s.target)}));return t[o]=c,c}if("tag"==a){var m=e.tags[o],l=new k(Object.assign(e.tags[o],{target:this.getOrMakeRecursive(e,t,m.target)}));return t[o]=l,l}if("commit"==a){var u=e.commits[o],d=u.parents.map((function(o){return this.getOrMakeRecursive(e,t,o)}),this),h=new y(Object.assign(u,{parents:d,gitVisuals:this.gitVisuals}));return t[o]=h,h}throw new Error("ruh rho!! unsupported type for "+o)},b.prototype.tearDown=function(){this.tornDown||(this.eventBaton.releaseBaton("processGitCommand",this.dispatch,this),this.removeAll(),this.tornDown=!0)},b.prototype.reloadGraphics=function(){this.gitVisuals.rootCommit=this.refs.C0,this.gitVisuals.initHeadBranch(),this.gitVisuals.drawTreeFromReload(),this.gitVisuals.refreshTreeHarsh()},b.prototype.removeAll=function(){this.branchCollection.reset(),this.tagCollection.reset(),this.commitCollection.reset(),this.refs={},this.HEAD=null,this.rootCommit=null,this.origin&&(this.origin.gitVisuals.getVisualization().tearDown(),delete this.origin,this.gitVisuals.getVisualization().clearOrigin()),this.gitVisuals.resetAll()},b.prototype.getDetachedHead=function(){return"branch"!==this.HEAD.get("target").get("type")},b.prototype.validateBranchName=function(e){if(e=(e=e.replace(/&#x2F;/g,"/")).replace(/\s/g,""),!/^(\w+[.\/\-]?)+\w+$/.test(e)||0===e.search("o/"))throw new h({msg:i.str("bad-branch-name",{branch:e})});if(/^[cC]\d+$/.test(e))throw new h({msg:i.str("bad-branch-name",{branch:e})});if(/[hH][eE][aA][dD]/.test(e))throw new h({msg:i.str("bad-branch-name",{branch:e})});return e.length>9&&(e=e.slice(0,9),this.command.addWarning(i.str("branch-name-short",{branch:e}))),e},b.prototype.validateAndMakeBranch=function(e,t){if(e=this.validateBranchName(e),this.refs[e])throw new h({msg:i.str("bad-branch-name",{branch:e})});return this.makeBranch(e,t)},b.prototype.validateAndMakeTag=function(e,t){if(e=this.validateBranchName(e),this.refs[e])throw new h({msg:i.str("bad-tag-name",{tag:e})});this.makeTag(e,t)},b.prototype.makeBranch=function(e,t){if(this.refs[e])throw new Error("woah already have that");var o=new w({target:t,id:e});return this.branchCollection.add(o),this.refs[o.get("id")]=o,o},b.prototype.makeTag=function(e,t){if(this.refs[e])throw new Error("woah already have that");var o=new k({target:t,id:e});return this.tagCollection.add(o),this.refs[o.get("id")]=o,o},b.prototype.getHead=function(){return Object.assign({},this.HEAD)},b.prototype.getTags=function(){var e=[];return this.tagCollection.each((function(t){e.push({id:t.get("id"),target:t.get("target"),remote:t.getIsRemote(),obj:t})}),this),e},b.prototype.getBranches=function(){var e=[];return this.branchCollection.each((function(t){e.push({id:t.get("id"),selected:this.HEAD.get("target")===t,target:t.get("target"),remote:t.getIsRemote(),obj:t})}),this),e},b.prototype.getRemoteBranches=function(){return this.getBranches().filter((function(e){return!0===e.remote}))},b.prototype.getLocalBranches=function(){return this.getBranches().filter((function(e){return!1===e.remote}))},b.prototype.printBranchesWithout=function(e){var t=this.getUpstreamBranchSet()[this.getCommitFromRef(e).get("id")].map((function(e){return e.selected=this.HEAD.get("target").get("id")==e.id,e}),this);this.printBranches(t)},b.prototype.printBranches=function(e){var t="";throw e.forEach((function(e){t+=(e.selected?"* ":"")+e.id+"\n"})),new p({msg:t})},b.prototype.printTags=function(e){var t="";throw e.forEach((function(e){t+=e.id+"\n"})),new p({msg:t})},b.prototype.printRemotes=function(e){var t="";throw e.verbose?(t+="origin (fetch)\n",t+=g+"git@github.com:pcottle/foo.git\n\n",t+="origin (push)\n",t+=g+"git@github.com:pcottle/foo.git"):t+="origin",new p({msg:t})},b.prototype.getUniqueID=function(){for(var e=this.uniqueId("C"),t=function(e){return!!this.refs[e]||!(!this.origin||!this.origin.refs[e])}.bind(this);t(e);)e=this.uniqueId("C");return e},b.prototype.makeCommit=function(e,t,o){t||(t=this.getUniqueID());var n=new y(Object.assign({parents:e,id:t,gitVisuals:this.gitVisuals},o||{}));return this.refs[n.get("id")]=n,this.commitCollection.add(n),n},b.prototype.revert=function(e){var t=e.map((function(e){return this.getCommitFromRef(e)}),this),o=a.defer(),n=o.promise,r=this.resolveID("HEAD");n=this.animationFactory.highlightEachWithPromise(n,t,r);var s=this.getCommitFromRef("HEAD"),c=function(e){var t=this.rebaseAltID(e.get("id")),o=i.str("git-revert-msg",{oldCommit:this.resolveName(e),oldMsg:e.get("commitMessage")}),n=this.makeCommit([s],t,{commitMessage:o});return s=n,this.animationFactory.playCommitBirthPromiseAnimation(n,this.gitVisuals)}.bind(this);t.forEach((function(e){n=n.then((function(){return c(e)}))})),n=n.then(function(){return this.setTargetLocation("HEAD",s),this.animationFactory.playRefreshAnimation(this.gitVisuals)}.bind(this)),this.animationQueue.thenFinish(n,o)},b.prototype.reset=function(e){this.setTargetLocation("HEAD",this.getCommitFromRef(e))},b.prototype.setupCherrypickChain=function(e){var t=a.defer(),o=t.promise,n=this.resolveID("HEAD");o=this.animationFactory.highlightEachWithPromise(o,e,n);var i=function(e){var t=this.cherrypick(e);return this.animationFactory.playCommitBirthPromiseAnimation(t,this.gitVisuals)}.bind(this);e.forEach((function(e){o=o.then((function(){return i(e)}))}),this),this.animationQueue.thenFinish(o,t)},b.prototype.checkUpstreamOfSource=function(e,t,o,n,a){if(!m.getUpstreamSet(t,n)[e.getCommitFromRef(o).get("id")])throw new h({msg:a||i.str("git-error-origin-fetch-no-ff")})},b.prototype.getTargetGraphDifference=function(e,t,o,n,a){a=a||{},n=t.resolveID(n);var r=m.getUpstreamSet(e,o),s=t.getCommitFromRef(n),c=t.exportTree(),l=c.commits[s.get("id")];if(r[l.id]){if(a.dontThrowOnNoFetch)return[];throw new h({msg:i.str("git-error-origin-fetch-uptodate")})}l.depth=0;for(var u=[],d=[l],p=function(e){if(!r[e]){var t=c.commits[e];t.depth=g.depth+1,d.push(t)}};d.length;){var g=d.pop();u.push(g),g.parents.forEach(p)}for(var f=m.getUniqueObjects(u),b=[],v=function(e){var t=!0;return e.parents.forEach((function(e){t=t&&r[e]})),t};f.length;)for(var w=0;w<f.length;w++)if(v(f[w])){var y=f[w];b.push(y),f.splice(w,1),r[y.id]=!0}return b},b.prototype.push=function(e){if(""!==(e=e||{}).source){var t=this.refs[e.source];if(t&&"tag"===t.attributes.type)throw new h({msg:i.todo("Tags are not allowed as sources for pushing")});this.origin.refs[e.destination]||(this.makeBranchOnOriginAndTrack(e.destination,this.getCommitFromRef(t)),this.animationFactory.playRefreshAnimation(this.origin.gitVisuals),this.animationFactory.playRefreshAnimation(this.gitVisuals));var o=this.origin.refs[e.destination],n=this.resolveID(e.source||"HEAD");e.force||this.checkUpstreamOfSource(this,this.origin,o,n,i.str("git-error-origin-push-no-ff"));var r=this.getTargetGraphDifference(this.origin,this,o,n,{dontThrowOnNoFetch:!0});if(!r.length){if(!e.force)throw new h({msg:i.str("git-error-origin-fetch-uptodate")});var s=this.getCommitFromRef(t),c=this.getCommitFromRef(o);if(s.id===c.id)throw new h({msg:i.str("git-error-origin-fetch-uptodate")})}r=r.filter((function(e){return!this.origin.refs[e.id]}),this);var m=function(e,t){var o=t.map((function(e){return this.origin.refs[e]}),this);return this.origin.makeCommit(o,e)}.bind(this),l=function(e,t){var o=m(e,t);return this.animationFactory.playCommitBirthPromiseAnimation(o,this.origin.gitVisuals)}.bind(this),u=a.defer(),d=u.promise;r.forEach((function(e){d=(d=d.then(function(){return this.animationFactory.playHighlightPromiseAnimation(this.refs[e.id],o)}.bind(this))).then((function(){return l(e.id,e.parents)}))}),this),d=(d=d.then(function(){var e=this.getCommitFromRef(n).get("id"),t=this.origin.refs[e];return this.origin.setTargetLocation(o,t),this.animationFactory.playRefreshAnimation(this.gitVisuals),this.animationFactory.playRefreshAnimation(this.origin.gitVisuals)}.bind(this))).then(function(){var t=this.getCommitFromRef(n);return this.setTargetLocation(this.refs["o/"+e.destination],t),this.animationFactory.playRefreshAnimation(this.gitVisuals)}.bind(this)),e.dontResolvePromise||this.animationQueue.thenFinish(d,u)}else this.pushDeleteRemoteBranch(this.refs["o/"+e.destination],this.origin.refs[e.destination])},b.prototype.pushDeleteRemoteBranch=function(e,t){if("master"===t.get("id"))throw new h({msg:i.todo("You cannot delete master branch on remote!")});var o=e.get("id");this.origin.deleteBranch(t),this.deleteBranch(e),this.branchCollection.each((function(e){e.getRemoteTrackingBranchID()===o&&e.setRemoteTrackingBranchID(null)}),this),this.origin.pruneTree(),this.origin.externalRefresh()},b.prototype.fetch=function(e){var t;if(!(e=e||{}).destination||""!==e.source){if(e.destination&&e.source)return t=(t=t||this.makeRemoteBranchIfNeeded(e.source))||this.makeBranchIfNeeded(e.destination),e.didMakeBranch=t,this.fetchCore([{destination:e.destination,source:e.source}],e);var o=this.origin.branchCollection.toArray().map((function(e){var o=e.get("id");return t=t||this.makeRemoteBranchIfNeeded(o),{destination:e.getPrefixedID(),source:o}}),this);return e.didMakeBranch=t,this.fetchCore(o,e)}this.validateAndMakeBranch(e.destination,this.getCommitFromRef("HEAD"))},b.prototype.fetchCore=function(e,t){e.forEach((function(e){this.checkUpstreamOfSource(this,this.origin,e.destination,e.source)}),this);var o=[];if(e.forEach((function(e){o=o.concat(this.getTargetGraphDifference(this,this.origin,e.destination,e.source,Object.assign({},t,{dontThrowOnNoFetch:!0})))}),this),!o.length&&!t.dontThrowOnNoFetch)throw new h({msg:i.str("git-error-origin-fetch-uptodate")});o=m.getUniqueObjects(o),o=(o=m.descendSortDepth(o)).filter((function(e){return!this.refs[e.id]}),this);var n=function(e,t){var o=t.map((function(e){return this.refs[e]}),this);return this.makeCommit(o,e)}.bind(this),r=function(e,t){var o=n(e,t);return this.animationFactory.playCommitBirthPromiseAnimation(o,this.gitVisuals)}.bind(this),s=a.defer(),c=s.promise;t.didMakeBranch&&(c=c.then(function(){return this.animationFactory.playRefreshAnimation(this.origin.gitVisuals),this.animationFactory.playRefreshAnimation(this.gitVisuals)}.bind(this)));var l=this.origin.getUpstreamBranchSet();return o.forEach((function(e){var t=l[e.id][0].obj,o=this.refs[t.getPrefixedID()];c=(c=c.then(function(){return this.animationFactory.playHighlightPromiseAnimation(this.origin.refs[e.id],o)}.bind(this))).then((function(){return r(e.id,e.parents)}))}),this),c=c.then(function(){return e.forEach((function(e){var t=this.refs[e.destination],o=this.origin.getCommitFromRef(e.source).get("id"),n=this.refs[o];this.setTargetLocation(t,n)}),this),this.animationFactory.playRefreshAnimation(this.origin.gitVisuals),this.animationFactory.playRefreshAnimation(this.gitVisuals)}.bind(this)),t.dontResolvePromise||this.animationQueue.thenFinish(c,s),{chain:c,deferred:s}},b.prototype.pull=function(e){e=e||{};var t=this.getOneBeforeCommit("HEAD"),o=this.fetch({dontResolvePromise:!0,dontThrowOnNoFetch:!0,source:e.source,destination:e.destination});if(o){var n=this.refs[e.destination];e.isRebase?this.pullFinishWithRebase(o,t,n):this.pullFinishWithMerge(o,t,n)}},b.prototype.pullFinishWithRebase=function(e,t,o){var n=e.chain,a=e.deferred;n=(n=(n=(n=(n=n.then(function(){if(this.isUpstreamOf(o,t))throw this.command.set("error",new p({msg:i.str("git-result-uptodate")})),"STAPH"}.bind(this))).then(function(){return this.animationFactory.getDelayedPromise(300)}.bind(this))).then(function(){return this.animationFactory.playHighlightPromiseAnimation(this.getCommitFromRef(o),t)}.bind(this))).then(function(){if(e.dontResolvePromise=!0,this.isUpstreamOf(t,o))return this.setTargetLocation(t,this.getCommitFromRef(o)),this.checkout(t),this.animationFactory.playRefreshAnimation(this.gitVisuals);try{return this.rebase(o,t,e)}catch(e){if(this.filterError(e),e.getMsg()!==i.str("git-error-rebase-none"))throw e;return this.setTargetLocation(t,this.getCommitFromRef(o)),this.checkout(t),this.animationFactory.playRefreshAnimation(this.gitVisuals)}}.bind(this))).fail(f),this.animationQueue.thenFinish(n,a)},b.prototype.pullFinishWithMerge=function(e,t,o){var n=e.chain,a=e.deferred;n=(n=(n=(n=(n=(n=(n=n.then(function(){if(this.mergeCheck(o,t))throw this.command.set("error",new p({msg:i.str("git-result-uptodate")})),"STAPH"}.bind(this))).then(function(){return this.animationFactory.getDelayedPromise(300)}.bind(this))).then(function(){return this.animationFactory.playHighlightPromiseAnimation(this.getCommitFromRef(o),t)}.bind(this))).then(function(){return this.animationFactory.playHighlightPromiseAnimation(this.getCommitFromRef(t),o)}.bind(this))).then(function(){return this.animationFactory.getDelayedPromise(700)}.bind(this))).then(function(){var e=this.merge(o);return e?this.animationFactory.playCommitBirthPromiseAnimation(e,this.gitVisuals):this.animationFactory.playRefreshAnimation(this.gitVisuals)}.bind(this))).fail(f),this.animationQueue.thenFinish(n,a)},b.prototype.fakeTeamwork=function(e,t){for(var o=function(){var e=this.getUniqueID();return this.origin.receiveTeamwork(e,t,this.animationQueue)}.bind(this),n=function(){var e=o();return this.animationFactory.playCommitBirthPromiseAnimation(e,this.origin.gitVisuals)}.bind(this),i=a.defer(),r=i.promise,s=0;s<e;s++)r=r.then(n);this.animationQueue.thenFinish(r,i)},b.prototype.receiveTeamwork=function(e,t,o){this.checkout(this.resolveID(t));var n=this.makeCommit([this.getCommitFromRef("HEAD")],e);return this.setTargetLocation(this.HEAD,n),n},b.prototype.cherrypick=function(e){var t=this.rebaseAltID(e.get("id")),o=this.makeCommit([this.getCommitFromRef("HEAD")],t);return this.setTargetLocation(this.HEAD,o),o},b.prototype.commit=function(e){e=e||{};var t=this.getCommitFromRef(this.HEAD),o=null;e.isAmend&&(t=this.resolveID("HEAD~1"),o=this.rebaseAltID(this.getCommitFromRef("HEAD").get("id")));var n=this.makeCommit([t],o);return this.getDetachedHead()&&"git"===this.mode&&this.command.addWarning(i.str("git-warning-detached")),this.setTargetLocation(this.HEAD,n),n},b.prototype.resolveName=function(e){var t=this.resolveID(e);return"commit"==t.get("type")?"commit "+t.get("id"):"branch"==t.get("type")?'branch "'+t.get("id")+'"':this.resolveName(t.get("target"))},b.prototype.resolveID=function(e){if(null==e)throw new Error("Don't call this with null / undefined");return"string"!=typeof e?e:this.resolveStringRef(e)},b.prototype.resolveRelativeRef=function(e,t){for(var o,n=/([~\^])(\d*)/g;o=n.exec(t);){var a=e,r=o[2]?parseInt(o[2],10):1;if("^"==o[1])a=e.getParent(r-1);else for(;a&&r--;)a=a.getParent(0);if(!a){var s=i.str("git-error-relative-ref",{commit:e.id,match:o[0]});throw new h({msg:s})}e=a}return e},b.prototype.resolveStringRef=function(e){if(e=this.crappyUnescape(e),this.refs[e])return this.refs[e];if(e.match(/^c\d+'*/)&&this.refs[e.toUpperCase()])return this.refs[e.toUpperCase()];var t=null,o=null,n=/^([a-zA-Z0-9]+)(([~\^]\d*)*)$/.exec(e);if(!n)throw new h({msg:i.str("git-error-exist",{ref:e})});if(t=n[1],o=n[2],!this.refs[t])throw new h({msg:i.str("git-error-exist",{ref:e})});var a=this.getCommitFromRef(t);return o&&(a=this.resolveRelativeRef(a,o)),a},b.prototype.getCommitFromRef=function(e){for(var t=this.resolveID(e);"commit"!==t.get("type");)t=t.get("target");return t},b.prototype.getType=function(e){return this.resolveID(e).get("type")},b.prototype.setTargetLocation=function(e,t){"commit"!=this.getType(e)&&(e=this.getOneBeforeCommit(e)).set("target",t)},b.prototype.updateBranchesFromSet=function(e){if(!e)throw new Error("need commit set here");var t=this.getUpstreamBranchSet(),o={};e.forEach((function(e,n){t[n].forEach((function(e){o[e.id]=!0}))}),this);var n=o.map((function(e,t){return t}));return this.updateBranchesForHg(n)},b.prototype.updateAllBranchesForHgAndPlay=function(e){return this.updateBranchesForHg(e)&&this.animationFactory.playRefreshAnimationSlow(this.gitVisuals)},b.prototype.updateAllBranchesForHg=function(){var e=this.branchCollection.map((function(e){return e.get("id")}));return this.updateBranchesForHg(e)},b.prototype.syncRemoteBranchFills=function(){this.branchCollection.each((function(e){if(e.getIsRemote()){var t=this.origin.refs[e.getBaseID()];if(t.get("visBranch")){var o=t.get("visBranch").get("fill");e.get("visBranch").set("fill",o)}}}),this)},b.prototype.updateBranchesForHg=function(e){var t=!1;return e.forEach((function(e){var o=this.getCommitFromRef(e).get("id"),n=this.getBumpedID(o);if(this.refs[n]){var a;for(t=!0;this.refs[n];)a=n,n=this.rebaseAltID(n);this.setTargetLocation(this.refs[e],this.refs[a])}}),this),!!t},b.prototype.updateCommitParentsForHgRebase=function(e){var t=!1;return Object.keys(e).forEach((function(e){var o=this.refs[e].checkForUpdatedParent(this);t=t||o}),this),t},b.prototype.pruneTreeAndPlay=function(){return this.pruneTree()&&this.animationFactory.playRefreshAnimationSlow(this.gitVisuals)},b.prototype.pruneTree=function(){var e=this.getUpstreamBranchSet(),t=m.getUpstreamSet(this,"HEAD");Object.keys(t).forEach((function(t){e[t]=!0}));var o=[];if(this.commitCollection.each((function(t){e[t.get("id")]||o.push(t)}),this),o.length)return this.command&&this.command.addWarning(i.str("hg-prune-tree")),o.forEach((function(e){e.removeFromParents(),this.commitCollection.remove(e);var t=e.get("id");this.refs[t]=void 0,delete this.refs[t];var o=e.get("visNode");o&&o.removeAll()}),this),!0},b.prototype.getUpstreamBranchSet=function(){return this.getUpstreamCollectionSet(this.branchCollection)},b.prototype.getUpstreamTagSet=function(){return this.getUpstreamCollectionSet(this.tagCollection)},b.prototype.getUpstreamCollectionSet=function(e){var t={};return e.each((function(e){(function(e){for(var t=[],o=[e];o.length;){var n=o.pop();t.push(n.get("id")),n.get("parents")&&n.get("parents").length&&(o=o.concat(n.get("parents")))}return t})(e.get("target")).forEach((function(o){t[o]=t[o]||[],function(e,t){var o=!1;return e.forEach((function(e){e.id==t&&(o=!0)})),o}(t[o],e.get("id"))||t[o].push({obj:e,id:e.get("id")})}))})),t},b.prototype.getUpstreamHeadSet=function(){var e=m.getUpstreamSet(this,"HEAD");return e[this.getCommitFromRef("HEAD").get("id")]=!0,e},b.prototype.getOneBeforeCommit=function(e){var t=this.resolveID(e);return t!==this.HEAD||this.getDetachedHead()||(t=t.get("target")),t},b.prototype.scrapeBaseID=function(e){var t=/^C(\d+)/.exec(e);if(!t)throw new Error("regex failed on "+e);return"C"+t[1]},b.prototype.rebaseAltID=function(e){for(var t=this.getBumpedID(e);this.refs[t];)t=this.getBumpedID(t);return t},b.prototype.getMostRecentBumpedID=function(e){for(var t,o=e;this.refs[o];)t=o,o=this.getBumpedID(o);return t},b.prototype.getBumpedID=function(e){for(var t=[[/^C(\d+)[']{0,2}$/,function(e){return e[0]+"'"}],[/^C(\d+)[']{3}$/,function(e){return e[0].slice(0,-3)+"'^4"}],[/^C(\d+)['][\^](\d+)$/,function(e){return"C"+String(e[1])+"'^"+String(Number(e[2])+1)}]],o=0;o<t.length;o++){var n=t[o][0],a=t[o][1],i=n.exec(e);if(i)return a(i)}throw new Error("could not modify the id "+e)},b.prototype.idSortFunc=function(e,t){var o=[[/^C(\d+)$/,function(e){return 1e3*e[1]}],[/^C(\d+)([']+)$/,function(e){return 1e3*e[1]+e[2].length}],[/^C(\d+)['][\^](\d+)$/,function(e){return 1e3*e[1]+Number(e[2])}]],n=function(e){for(var t=0;t<o.length;t++){var n=o[t][0],a=o[t][1],i=n.exec(e);if(i)return a(i)}throw new Error("Could not parse commit ID "+e)};return n(e.get("id"))-n(t.get("id"))},b.prototype.dateSortFunc=function(e,t){return b.prototype.idSortFunc(e,t)},b.prototype.hgRebase=function(e,t){var o=a.defer(),n=this.rebase(e,t,{dontResolvePromise:!0,deferred:o});if(n){this.getCommonAncestor(e,t);var i=this.getCommitFromRef(t),r=this.getDownstreamSet(t),s=m.getUpstreamSet(this,e),c=this.getUpstreamDiffSetFromSet(s,t),l=[];Object.keys(c).forEach((function(e){l.push(this.getDownstreamSet(e))}),this);var u={};u[i.get("id")]=!0,[c,r].concat(l).forEach((function(e){Object.keys(e).forEach((function(e){u[e]=!0}))}));var d={},h=this.getUpstreamBranchSet();Object.keys(u).forEach((function(e){h[e].forEach((function(e){d[e.id]=!0}))}));var p=Object.keys(d);n=(n=(n=n.then(function(){if(this.updateCommitParentsForHgRebase(u))return this.animationFactory.playRefreshAnimationSlow(this.gitVisuals)}.bind(this))).then(function(){return this.updateAllBranchesForHgAndPlay(p)}.bind(this))).then(function(){return this.pruneTreeAndPlay()}.bind(this)),this.animationQueue.thenFinish(n,o)}},b.prototype.rebase=function(e,t,o){if(this.isUpstreamOf(e,t))return this.command.setResult(i.str("git-result-uptodate")),void this.checkout(t);if(this.isUpstreamOf(t,e))return this.setTargetLocation(t,this.getCommitFromRef(e)),this.command.setResult(i.str("git-result-fastforward")),void this.checkout(t);var n=m.getUpstreamSet(this,e),a=this.getUpstreamDiffFromSet(n,t);return this.rebaseFinish(a,n,e,t,o)},b.prototype.getUpstreamDiffSetFromSet=function(e,t){var o={};return this.getUpstreamDiffFromSet(e,t).forEach((function(e){o[e.get("id")]=!0})),o},b.prototype.getUpstreamDiffFromSet=function(e,t){var o=m.bfsFromLocationWithSet(this,t,e);return o.sort(this.dateSortFunc),o},b.prototype.getInteractiveRebaseCommits=function(e,t){for(var o=m.getUpstreamSet(this,e),n=[],a=[this.getCommitFromRef(t)];a.length;){var r=a.pop();o[r.get("id")]||(n.push(r),(a=a.concat(r.get("parents"))).sort(this.dateSortFunc))}var s=[];if(n.forEach((function(e){1==e.get("parents").length&&s.push(e)})),!s.length)throw new h({msg:i.str("git-error-rebase-none")});return s},b.prototype.rebaseInteractiveTest=function(e,t,o){o=o||{};var n,a=this.getInteractiveRebaseCommits(e,t),r={};if(a.forEach((function(e){var t=e.get("id");r[t]=e})),0===o.interactiveTest.length)n=a;else{var s=o.interactiveTest[0].split(","),c=[];if(n=[],s.forEach((function(e){e in r?n.push(r[e]):c.push(e)})),c.length>0)throw new h({msg:i.todo("Hey those commits don't exist in the set!")})}this.rebaseFinish(n,{},e,t)},b.prototype.rebaseInteractive=function(t,o,n){n=n||{};var r=this.getInteractiveRebaseCommits(t,o);this.animationQueue.set("defer",!0);var s,c=a.defer();if(c.promise.then(function(e){if(!e.length)throw new p({msg:i.str("git-result-nothing")});this.rebaseFinish(e,{},t,o)}.bind(this)).fail(function(e){this.filterError(e),this.command.set("error",e),this.animationQueue.start()}.bind(this)).done(),n.initialCommitOrdering&&n.initialCommitOrdering.length>0){var m={};r.forEach((function(e){m[e.get("id")]=!0})),s=[],n.initialCommitOrdering[0].split(",").forEach((function(e){if(!m[e])throw new h({msg:i.todo("Hey those commits don't exist in the set!")});s.push(e)}))}new(0,e("../views/rebaseView").InteractiveRebaseView)({deferred:c,toRebase:r,initialCommitOrdering:s,aboveAll:n.aboveAll})},b.prototype.filterRebaseCommits=function(e,t,o){var n={};Object.keys(t).forEach((function(e){n[this.scrapeBaseID(e)]=!0}),this);var a={};return e.filter((function(e){if(1!==e.get("parents").length&&!o.preserveMerges)return!1;var t=this.scrapeBaseID(e.get("id"));return!n[t]&&(!a[e.get("id")]&&(a[e.get("id")]=!0,!0))}),this)},b.prototype.getRebasePreserveMergesParents=function(e){return e.get("parents").map((function(e){var t=e.get("id"),o=this.getMostRecentBumpedID(t);return this.refs[o]}),this)},b.prototype.rebaseFinish=function(e,t,o,n,r){r=r||{};var s=this.resolveID(o),c=r.deferred||a.defer(),m=r.chain||c.promise,l=this.filterRebaseCommits(e,t,r);if(!l.length)throw new h({msg:i.str("git-error-rebase-none")});m=this.animationFactory.highlightEachWithPromise(m,l,s);var u=this.getCommitFromRef(o),d=!1,p=function(e){var t,o=this.rebaseAltID(e.get("id"));t=r.preserveMerges&&d&&d?this.getRebasePreserveMergesParents(e):[u];var n=this.makeCommit(t,o);return u=n,d=!0,this.animationFactory.playCommitBirthPromiseAnimation(n,this.gitVisuals)}.bind(this);return l.forEach((function(e){m=m.then((function(){return p(e)}))}),this),m=m.then(function(){return"commit"==this.resolveID(n).get("type")?this.checkout(u):(this.setTargetLocation(n,u),this.checkout(n)),this.animationFactory.playRefreshAnimation(this.gitVisuals)}.bind(this)),r.dontResolvePromise||this.animationQueue.thenFinish(m,c),m},b.prototype.mergeCheck=function(e,t){var o=this.getCommitFromRef(e)===this.getCommitFromRef(t);return this.isUpstreamOf(e,t)||o},b.prototype.merge=function(e,t){t=t||{};if(this.mergeCheck(e,"HEAD"))throw new p({msg:i.str("git-result-uptodate")});if(this.isUpstreamOf("HEAD",e)&&!t.noFF)return this.setTargetLocation("HEAD",this.getCommitFromRef(e)),void this.command.setResult(i.str("git-result-fastforward"));var o=this.getCommitFromRef("HEAD"),n=this.getCommitFromRef(e),a=i.str("git-merge-msg",{target:this.resolveName(e),current:this.resolveName("HEAD")}),r=this.makeCommit([o,n],null,{commitMessage:a});return this.setTargetLocation("HEAD",r),r},b.prototype.checkout=function(e){var t=this.resolveID(e);if("HEAD"!==t.get("id")){var o=t.get("type");if("branch"===o&&t.getIsRemote()&&(t=this.getCommitFromRef(t.get("id"))),"branch"!==o&&"tag"!==o&&"commit"!==o)throw new h({msg:i.str("git-error-options")});"tag"===o&&(t=t.get("target")),this.HEAD.set("target",t)}},b.prototype.forceBranch=function(e,t){e=this.crappyUnescape(e),this.refs[e]||this.branch(e,t);var o=this.resolveID(e);if("branch"!==o.get("type"))throw new h({msg:i.str("git-error-options")});if(o.getIsRemote())throw new h({msg:i.str("git-error-remote-branch")});var n=this.getCommitFromRef(t);this.setTargetLocation(o,n)},b.prototype.branch=function(e,t){var o=this.getCommitFromRef(t),n=this.validateAndMakeBranch(e,o);t=this.resolveID(t),this.isRemoteBranchRef(t)&&this.setLocalToTrackRemote(n,t)},b.prototype.isRemoteBranchRef=function(e){var t=this.resolveID(e);return"branch"===t.get("type")&&t.getIsRemote()},b.prototype.tag=function(e,t){var o=this.getCommitFromRef(t);this.validateAndMakeTag(e,o)},b.prototype.describe=function(e){var t=this.getCommitFromRef(e),o={};this.tagCollection.toJSON().forEach((function(e){o[e.target.get("id")]=e.id}));for(var n,a=[t],r=[];a.length;){var s=a.pop(),c=s.get("id");if(o[c]){n=o[c];break}r.push(s.get("id"));var m=s.get("parents");m&&m.length&&(a=a.concat(m)).sort(this.dateSortFunc)}if(!n)throw new h({msg:i.todo("Fatal: no tags found upstream")});if(0===r.length)throw new p({msg:n});throw new p({msg:n+"_"+r.length+"_g"+t.get("id")})},b.prototype.validateAndDeleteBranch=function(e){var t=this.resolveID(e);if("branch"!==t.get("type")||"master"==t.get("id")||this.HEAD.get("target")===t)throw new h({msg:i.str("git-error-branch")});var o=t;if(t.getIsRemote())throw new h({msg:i.str("git-error-remote-branch")});this.deleteBranch(o)},b.prototype.deleteBranch=function(e){this.branchCollection.remove(e),this.refs[e.get("id")]=void 0,delete this.refs[e.get("id")],this.HEAD.get("target")===e&&this.HEAD.set("target",this.refs.master),e.get("visBranch")&&e.get("visBranch").remove()},b.prototype.crappyUnescape=function(e){return e.replace(/&#x27;/g,"'").replace(/&#x2F;/g,"/")},b.prototype.filterError=function(e){if(!(e instanceof h||e instanceof p))throw e},b.prototype.externalRefresh=function(){this.animationQueue=new s({callback:function(){}}),this.animationFactory.refreshTree(this.animationQueue,this.gitVisuals),this.animationQueue.start()},b.prototype.dispatch=function(e,t){this.command=e;var o=e.get("vcs"),n=function(){this.dispatchProcess(e,t)}.bind(this);this.handleModeChange(o,n)},b.prototype.dispatchProcess=function(e,t){var o=function(){e.finishWith(t)}.bind(this);this.animationQueue=new s({callback:o});var n=e.get("vcs"),a=e.get("method").replace(/-/g,"");try{d.commands.execute(n,a,this,this.command)}catch(o){return this.filterError(o),e.set("error",o),void t.resolve()}var i=this.animationQueue.get("defer")||this.animationQueue.get("promiseBased");this.animationQueue.get("animations").length||i||this.animationFactory.refreshTree(this.animationQueue,this.gitVisuals),i||this.animationQueue.start()},b.prototype.show=function(e){var t=this.getCommitFromRef(e);throw new p({msg:t.getShowEntry()})},b.prototype.status=function(){var e=[];if(this.getDetachedHead())e.push(i.str("git-status-detached"));else{var t=this.HEAD.get("target").get("id");e.push(i.str("git-status-onbranch",{branch:t}))}e.push("Changes to be committed:"),e.push(""),e.push(g+"modified: cal/OskiCostume.stl"),e.push(""),e.push(i.str("git-status-readytocommit"));var o="";throw e.forEach((function(e){o+="# "+e+"\n"})),new p({msg:o})},b.prototype.logWithout=function(e,t){t=t.slice(1),this.log(e,m.getUpstreamSet(this,t))},b.prototype.revlist=function(e){var t=new C(this,e).formatRevisions((function(e){return e.id+"\n"}));throw new p({msg:t})},b.prototype.log=function(e){var t=new C(this,e).formatRevisions((function(e){return e.getLogEntry()}));throw new p({msg:t})},b.prototype.getCommonAncestor=function(e,t,o){if(this.isUpstreamOf(t,e)&&!o)throw new Error("Don't use common ancestor if we are upstream!");for(var n=m.getUpstreamSet(this,e),a=[this.getCommitFromRef(t)];a.length;){var i=a.pop();if(n[i.get("id")])return i;a=a.concat(i.get("parents"))}throw new Error("something has gone very wrong... two nodes aren't connected!")},b.prototype.isUpstreamOf=function(e,t){return e=this.getCommitFromRef(e),void 0!==m.getUpstreamSet(this,t)[e.get("id")]},b.prototype.getDownstreamSet=function(e){var t=this.getCommitFromRef(e),o=t.get("id"),n=[t],a={};a[o]=!0;for(var i=function(e){a[e.get("id")]=!0,n.push(e)};n.length;){n.pop().get("children").forEach(i)}return a};var v=n.Model.extend({initialize:function(){if(!this.get("target"))throw new Error("must be initialized with target");if(!this.get("id"))throw new Error("must be given an id");this.set("type","general ref"),"HEAD"==this.get("id")&&(this.set("lastLastTarget",null),this.set("lastTarget",this.get("target")),this.on("change:target",this.targetChanged,this))},getIsRemote:function(){return!1},getName:function(){return this.get("id")},targetChanged:function(e,t,o){this.set("lastLastTarget",this.get("lastTarget")),this.set("lastTarget",t)},toString:function(){return"a "+this.get("type")+"pointing to "+String(this.get("target"))}}),w=v.extend({defaults:{visBranch:null,remoteTrackingBranchID:null,remote:!1},initialize:function(){v.prototype.initialize.call(this),this.set("type","branch")},setRemoteTrackingBranchID:function(e){this.set("remoteTrackingBranchID",e)},getRemoteTrackingBranchID:function(){return this.get("remoteTrackingBranchID")},getPrefixedID:function(){if(this.getIsRemote())throw new Error("im already remote");return"o/"+this.get("id")},getBaseID:function(){if(!this.getIsRemote())throw new Error("im not remote so can't get base");return this.get("id").replace("o/","")},getIsRemote:function(){return this.get("id"),"o/"===this.get("id").slice(0,2)}}),y=n.Model.extend({defaults:{type:"commit",children:null,parents:null,author:"Peter Cottle",createTime:null,commitMessage:null,visNode:null,gitVisuals:null},constants:{circularFields:["gitVisuals","visNode","children"]},getLogEntry:function(){return["Author: "+this.get("author"),"Date: "+this.get("createTime"),"<br/>",this.get("commitMessage"),"<br/>","Commit: "+this.get("id")].join("\n")+"\n"},getShowEntry:function(){return[this.getLogEntry(),"diff --git a/bigGameResults.html b/bigGameResults.html","--- bigGameResults.html","+++ bigGameResults.html","@@ 13,27 @@ Winner, Score","- Stanfurd, 14-7","+ Cal, 21-14"].join("\n")+"\n"},validateAtInit:function(){if(!this.get("id"))throw new Error("Need ID!!");if(this.get("createTime")||this.set("createTime",(new Date).toString()),this.get("commitMessage")||this.set("commitMessage",i.str("git-dummy-msg")),this.set("children",[]),!(this.get("rootCommit")||this.get("parents")&&this.get("parents").length))throw new Error("needs parents")},addNodeToVisuals:function(){var e=this.get("gitVisuals").addNode(this.get("id"),this);this.set("visNode",e)},addEdgeToVisuals:function(e){this.get("gitVisuals").addEdge(this.get("id"),e.get("id"))},getParent:function(e){return this&&this.attributes&&this.attributes.parents?this.attributes.parents[e]:null},removeFromParents:function(){this.get("parents").forEach((function(e){e.removeChild(this)}),this)},checkForUpdatedParent:function(e){var t=this.get("parents");if(!(t.length>1)){var o=t[0].get("id"),n=e.getMostRecentBumpedID(o);if(o!==n){var a=e.refs[n];this.removeFromParents(),this.set("parents",[a]),a.get("children").push(this);var i=this.get("visNode");i&&i.removeAllEdges();var r=this.get("gitVisuals");return r&&r.addEdge(this.get("id"),n),!0}}},removeChild:function(e){var t=[];this.get("children").forEach((function(o){o!==e&&t.push(o)})),this.set("children",t)},isMainParent:function(e){return 0===this.get("parents").indexOf(e)},initialize:function(e){this.validateAtInit(),this.addNodeToVisuals(),(this.get("parents")||[]).forEach((function(e){e.get("children").push(this),this.addEdgeToVisuals(e)}),this)}}),k=v.extend({defaults:{visTag:null},initialize:function(){v.prototype.initialize.call(this),this.set("type","tag")}});function C(e,t){this.engine=e,this.tipsToInclude=[],this.tipsToExclude=[],this.includedRefs={},this.excludedRefs={},this.revisions=[],this.processSpecifiers(t)}var A=/^(.*)\.\.(.*)$/;C.prototype.processAsRange=function(e){var t=e.match(A);return!!t&&(this.tipsToExclude.push(t[1]),this.tipsToInclude.push(t[2]),!0)},C.prototype.processAsExclusion=function(e){return!!e.startsWith("^")&&(this.tipsToExclude.push(e.slice(1)),!0)},C.prototype.processAsInclusion=function(e){return this.tipsToInclude.push(e),!0},C.prototype.processSpecifiers=function(e){var t=this,o=[this.processAsRange,this.processAsExclusion];e.forEach((function(e){o.some((function(o){return o.bind(t)(e)}))||t.processAsInclusion(e)})),this.tipsToExclude.forEach((function(e){t.addExcluded(m.getUpstreamSet(t.engine,e))})),this.tipsToInclude.forEach((function(e){t.addIncluded(m.getUpstreamSet(t.engine,e))}));var n=Array.from(Object.keys(t.includedRefs));t.revisions=n.map((function(e){return t.engine.resolveStringRef(e)})),t.revisions.sort(t.engine.dateSortFunc),t.revisions.reverse()},C.prototype.isExcluded=function(e){return this.excludedRefs.hasOwnProperty(e)},C.prototype.addExcluded=function(e){var t=this;Object.keys(e).forEach((function(e){t.isExcluded(e)||(t.excludedRefs[e]=!0)}))},C.prototype.addIncluded=function(e){var t=this;Object.keys(e).forEach((function(e){t.isExcluded(e)||(t.includedRefs[e]=!0)}))},C.prototype.formatRevisions=function(e){var t="";return this.revisions.forEach((function(o){t+=e(o)})),t},o.GitEngine=b,o.Commit=y,o.Branch=w,o.Tag=k,o.Ref=v},{"../app":44,"../commands":45,"../graph":56,"../graph/treeCompare":57,"../intl":59,"../util/errors":85,"../views/rebaseView":101,"../visuals/animation":103,"../visuals/animation/animationFactory":102,backbone:1,q:19}],56:[function(e,t,o){var n={getOrMakeRecursive:function(t,o,n,a){var i=e("../git"),r=i.Commit,s=i.Ref,c=i.Branch,m=i.Tag;if(o[n])return o[n];var l=function(e,t){if(e.commits[t])return"commit";if(e.branches[t])return"branch";if("HEAD"==t)return"HEAD";if(e.tags[t])return"tag";throw new Error("bad type for "+t)}(t,n);if("HEAD"==l){var u=t.HEAD,d=new s(Object.assign(t.HEAD,{target:this.getOrMakeRecursive(t,o,u.target)}));return o[n]=d,d}if("branch"==l){var h=t.branches[n],p=new c(Object.assign(t.branches[n],{target:this.getOrMakeRecursive(t,o,h.target)}));return o[n]=p,p}if("tag"==l){var g=t.tags[n],f=new m(Object.assign(t.tags[n],{target:this.getOrMakeRecursive(t,o,g.target)}));return o[n]=f,f}if("commit"==l){var b=t.commits[n],v=[];b.parents.forEach((function(e){v.push(this.getOrMakeRecursive(t,o,e))}),this);var w=new r(Object.assign(b,{parents:v,gitVisuals:this.gitVisuals}));return o[n]=w,w}throw new Error("ruh rho!! unsupported type for "+n)},descendSortDepth:function(e){return e.sort((function(e,t){return t.depth-e.depth}))},bfsFromLocationWithSet:function(e,t,o){for(var n=[],a=[e.getCommitFromRef(t)];a.length;){var i=a.pop();o[i.get("id")]||(n.push(i),a=a.concat(i.get("parents")))}return n},getUpstreamSet:function(e,t){var o=e.getCommitFromRef(t),n=o.get("id"),a=[o],i={};i[n]=!0;for(var r=function(e){i[e.get("id")]=!0,a.push(e)};a.length;){(a.pop().get("parents")||[]).forEach(r)}return i},getUniqueObjects:function(e){var t={},o=[];return e.forEach((function(e){t[e.id]||(t[e.id]=!0,o.push(e))})),o},getDefaultTree:function(){return JSON.parse(unescape("%7B%22branches%22%3A%7B%22master%22%3A%7B%22target%22%3A%22C1%22%2C%22id%22%3A%22master%22%2C%22type%22%3A%22branch%22%7D%7D%2C%22commits%22%3A%7B%22C0%22%3A%7B%22type%22%3A%22commit%22%2C%22parents%22%3A%5B%5D%2C%22author%22%3A%22Peter%20Cottle%22%2C%22createTime%22%3A%22Mon%20Nov%2005%202012%2000%3A56%3A47%20GMT-0800%20%28PST%29%22%2C%22commitMessage%22%3A%22Quick%20Commit.%20Go%20Bears%21%22%2C%22id%22%3A%22C0%22%2C%22rootCommit%22%3Atrue%7D%2C%22C1%22%3A%7B%22type%22%3A%22commit%22%2C%22parents%22%3A%5B%22C0%22%5D%2C%22author%22%3A%22Peter%20Cottle%22%2C%22createTime%22%3A%22Mon%20Nov%2005%202012%2000%3A56%3A47%20GMT-0800%20%28PST%29%22%2C%22commitMessage%22%3A%22Quick%20Commit.%20Go%20Bears%21%22%2C%22id%22%3A%22C1%22%7D%7D%2C%22HEAD%22%3A%7B%22id%22%3A%22HEAD%22%2C%22target%22%3A%22master%22%2C%22type%22%3A%22general%20ref%22%7D%7D"))}};t.exports=n},{"../git":55}],57:[function(e,t,o){var n=e("underscore"),a={dispatchFromLevel:function(e,t){var o=e.goalTreeString;return"string"!=typeof t&&console.warn("NEED to pass in string!! gah"),a.dispatch(e,o,t)},onlyMasterCompared:function(e){switch(!0){case!!e.compareOnlyMaster:case!!e.compareOnlyMasterHashAgnostic:case!!e.compareOnlyMasterHashAgnosticWithAsserts:return!0;default:return!1}},dispatch:function(e,t,o){var n=this.convertTreeSafe(t);if(o=this.convertTreeSafe(o),typeof n.originTree!=typeof o.originTree)return!1;var a=this.dispatchShallow(e,n,o);if(!a||!n.originTree)return a;var i=e.originCompare?e.originCompare:e;return a&&this.dispatchShallow(i,n.originTree,o.originTree)},dispatchShallow:function(e,t,o){switch(!0){case!!e.compareOnlyMaster:return a.compareBranchWithinTrees(o,t,"master");case!!e.compareOnlyBranches:return a.compareAllBranchesWithinTrees(o,t);case!!e.compareAllBranchesHashAgnostic:return a.compareAllBranchesWithinTreesHashAgnostic(o,t);case!!e.compareOnlyMasterHashAgnostic:return a.compareBranchesWithinTreesHashAgnostic(o,t,["master"]);case!!e.compareOnlyMasterHashAgnosticWithAsserts:return a.compareBranchesWithinTreesHashAgnostic(o,t,["master"])&&a.evalAsserts(o,e.goalAsserts);default:return a.compareAllBranchesWithinTreesAndHEAD(o,t)}},compareAllBranchesWithinTreesAndHEAD:function(e,t){return e=this.convertTreeSafe(e),t=this.convertTreeSafe(t),e.HEAD.target===t.HEAD.target&&this.compareAllBranchesWithinTrees(e,t)&&this.compareAllTagsWithinTrees(e,t)},compareAllBranchesWithinTrees:function(e,t){e=this.convertTreeSafe(e),t=this.convertTreeSafe(t);var o=Object.assign({},e.branches,t.branches);return Object.keys(o).every(function(o){return this.compareBranchWithinTrees(e,t,o)}.bind(this))},compareAllTagsWithinTrees:function(e,t){return e=this.convertTreeSafe(e),t=this.convertTreeSafe(t),this.reduceTreeFields([e,t]),n.isEqual(e.tags,t.tags)},compareBranchesWithinTrees:function(e,t,o){var n=!0;return o.forEach((function(o){n=n&&this.compareBranchWithinTrees(e,t,o)}),this),n},compareBranchWithinTrees:function(e,t,o){e=this.convertTreeSafe(e),t=this.convertTreeSafe(t),this.reduceTreeFields([e,t]);var a=this.getRecurseCompare(e,t),i=e.branches[o],r=t.branches[o];return n.isEqual(i,r)&&a(e.commits[i.target],t.commits[r.target])},compareAllBranchesWithinTreesHashAgnostic:function(e,t){e=this.convertTreeSafe(e),t=this.convertTreeSafe(t),this.reduceTreeFields([e,t]);var o=Object.assign({},e.branches,t.branches),n=Object.keys(o||{});return this.compareBranchesWithinTreesHashAgnostic(e,t,n)},compareBranchesWithinTreesHashAgnostic:function(e,t,o){e=this.convertTreeSafe(e),t=this.convertTreeSafe(t),this.reduceTreeFields([e,t]);var a=function(e,t){return!(!e||!t)&&(e=Object.assign({},e),t=Object.assign({},t),e.target=this.getBaseRef(e.target),t.target=this.getBaseRef(t.target),n.isEqual(e,t))}.bind(this),i=this.getRecurseCompareHashAgnostic(e,t),r=!0;return o.forEach((function(o){var n=e.branches[o],s=t.branches[o];r=r&&a(n,s)&&i(e.commits[n.target],t.commits[s.target])}),this),r},evalAsserts:function(e,t){var o=!0;return Object.keys(t).forEach((function(n){var a=t[n];o=o&&this.evalAssertsOnBranch(e,n,a)}),this),o},evalAssertsOnBranch:function(e,t,o){if(!(e=this.convertTreeSafe(e)).branches[t])return!1;for(var n=[e.branches[t].target],a={};n.length;){var i=n.pop();a[this.getBaseRef(i)]=this.getNumHashes(i),n=n.concat(e.commits[i].parents)}var r=!0;return o.forEach((function(e){try{r=r&&e(a)}catch(e){console.warn("error during assert",e),console.log(e),r=!1}})),r},getNumHashes:function(e){for(var t=[[/^C(\d+)([']{0,3})$/,function(e){return e[2]?e[2].length:0}],[/^C(\d+)['][\^](\d+)$/,function(e){return Number(e[2])}]],o=0;o<t.length;o++){var n=t[o][0],a=t[o][1],i=n.exec(e);if(i)return a(i)}throw new Error("couldn't parse ref "+e)},getBaseRef:function(e){var t=/^C(\d+)/.exec(e);if(!t)throw new Error("no regex matchy for "+e);return"C"+t[1]},getRecurseCompareHashAgnostic:function(e,t){var o=function(e){return e?Object.assign({},e,{id:this.getBaseRef(e.id),parents:null}):{}}.bind(this);return this.getRecurseCompare(e,t,{isEqual:function(e,t){return n.isEqual(o(e),o(t))}})},getRecurseCompare:function(e,t,o){o=o||{};var a=function(i,r){var s=o.isEqual?o.isEqual(i,r):n.isEqual(i,r);if(!s)return!1;for(var c=Math.max(i.parents.length,r.parents.length),m=0;m<c;m++){var l=i.parents[m],u=r.parents[m],d=e.commits[l],h=t.commits[u];s=s&&a(d,h)}return s};return a},lowercaseTree:function(e){e.HEAD&&(e.HEAD.target=e.HEAD.target.toLocaleLowerCase());var t=e.branches||{};return e.branches={},Object.keys(t).forEach((function(o){var n=t[o];n.id=n.id.toLocaleLowerCase(),e.branches[o.toLocaleLowerCase()]=n})),e},convertTreeSafe:function(e){return"string"!=typeof e||(e=JSON.parse(unescape(e)),this.lowercaseTree(e),e.originTree&&(e.originTree=this.lowercaseTree(e.originTree))),e},reduceTreeFields:function(e){var t=["parents","id","rootCommit"],o=["target","id","remoteTrackingBranchID"],n=["target","id"],a=["children","parents"],i={remoteTrackingBranchID:null},r={tags:{}};e.forEach((function(e){Object.keys(r).forEach((function(t){var o=r[t];void 0===e[t]&&(e[t]=o)}))}));var s=function(e,t,o,n){var a=e[t];Object.keys(a).forEach((function(r){var s=a[r],c={};o.forEach((function(e){void 0!==s[e]?c[e]=s[e]:void 0!==i[e]&&(c[e]=i[e])})),Object.values(n||{}).forEach((function(e){s[e]&&(s[e].sort(),c[e]=s[e])})),e[t][r]=c}))};e.forEach((function(e){s(e,"commits",t,a),s(e,"branches",o),s(e,"tags",n),e.HEAD={target:e.HEAD.target,id:e.HEAD.id},e.originTree&&this.reduceTreeFields([e.originTree])}),this)},compareTrees:function(e,t){return e=this.convertTreeSafe(e),t=this.convertTreeSafe(t),this.reduceTreeFields([e,t]),n.isEqual(e,t)}};t.exports=a},{underscore:36}],58:[function(e,t,o){(function(t){var{join:o}=e("path"),{readFileSync:n}=e("fs"),a=e("../util"),{strings:i}=e("../intl/strings"),r=/intl\.str\(\s*'([a-zA-Z\-]+)'/g,s=new Set(Object.keys(i));s.delete("error-untranslated");var c=new Set;a.isBrowser()||(a.readDirDeep(o(t,"../../")).forEach((function(e){for(var t,o,a=n(e);t=r.exec(a);)o=t[1],i[o]?(c.add(o),s.delete(o)):console.log('NO KEY for: "',o,'"')})),console.log(c.size," good keys found!"),console.log(s.size," keys did not use!"),console.log(s))}).call(this,"/src/js/intl")},{"../intl/strings":60,"../util":88,fs:3,path:12}],59:[function(e,t,o){var n=e("../stores/LocaleStore"),a=e("underscore"),i=e("../intl/strings").strings,r=n.getDefaultLocale,s={zh_TW:"zh_CN"},c=Object.assign({},a.templateSettings);c.interpolate=/\{(.+?)\}/g;var m=o.template=function(e,t){return a.template(e,t,c)},l=o.str=function(e,t){t=t||{};var o=n.getLocale();return i[e]?(i[e][o]||(o=s[o]||r()),i[e][o]?m(i[e][o],t):"error-untranslated"!==e?l("error-untranslated"):'No translation for the key "'+e+'"'):(console.warn("NO INTL support for key "+e),"NO INTL support for key "+e+". this is probably a dev error")},u=o.getIntlKey=function(e,t,o){if(!e||!e[t])throw new Error("that key "+t+"doesn't exist in this blob"+e);e[t][r()]||console.warn("WARNING!! This blob does not have intl support:",e,"for this key",t);var a=o||n.getLocale();return e[t][a]};o.todo=function(e){return e},o.getDialog=function(e){return u(e,"dialog")||e.dialog[r()]},o.getHint=function(e){return u(e,"hint")?u(e,"hint"):u(e,"hint",r())+" -- "+l("error-untranslated")},o.getName=function(e){return u(e,"name")?u(e,"name"):u(e,"name",r())+" -- "+l("error-untranslated")},o.getStartDialog=function(e){var t=u(e,"startDialog");if(t)return t;var o={type:"ModalAlert",options:{markdown:l("error-untranslated")}},n=Object.assign({},e.startDialog[r()]||e.startDialog);return n.childViews.unshift(o),n}},{"../intl/strings":60,"../stores/LocaleStore":81,underscore:36}],60:[function(e,t,o){o.strings={"finish-dialog-finished":{__desc__:"One of the lines in the next level dialog",ja:"最後のレベルをクリアしました！すごい！！",en_US:"Wow! You finished the last level, great!",de_DE:"Wow! Du hast den letzten Level gelöst, super!",zh_CN:"Wow！你通关了！",zh_TW:"我的天啊！您解開了最後一關，太強了！",es_AR:"¡Ea! Terminaste el último nivel, ¡genial!",es_ES:"¡Felicitaciones! Terminaste el último nivel!",pt_BR:"Uia! Você terminou o último nível, massa!",gl:"¡Yeeeha! Remataches o derradeiro nivel, ¡a tope!",fr_FR:"Félicitations, vous avez réussi le dernier niveau !",ru_RU:"Вау! Вы прошли последний уровень, отлично!",uk:"Вау! Ти пройшов останній рівень, круто!",ko:"와우! 마지막 레벨까지 마쳤습니다. 멋지네요!",vi:"Wao! Bạn đã phá đảo, quá tuyệt!"},"finish-dialog-next":{__desc__:"One of the lines in the next level dialog",en_US:'Would you like to move on to *"{nextLevel}"*, the next level?',de_DE:'Möchtest du mit *"{nextLevel}"* weitermachen, dem nächsten Level?',ja:'次の章 *"{nextLevel}"* へ進みますか？',zh_CN:"要不要试试下一关 *“{nextLevel}”*？",zh_TW:"下一關是*「{nextLevel}」*，您要繼續闖關嗎？",es_AR:'¿Querés seguir con *"{nextLevel}"*, el próximo nivel?',es_ES:'¿Quieres pasar al nivel *"{nextLevel}"*, el próximo nivel?',pt_BR:'Você gostaria de ir para o próximo nível: *"{nextLevel}"*?',gl:'¿Gustaríache ir o seguinte nivel: *"{nextLevel}"*?',fr_FR:'Voulez-vous passer à *"{nextLevel}"*, le prochain niveau ?',ru_RU:'Хотите перейти на следующий уровень: *"{nextLevel}"*?',uk:'Хочеш перейти на наступний рівень -- *"{nextLevel}"*?',ko:'다음 레벨로 넘어갈까요? 레벨 *"{nextLevel}"*',vi:'Bạn có muốn chuyển sang cấp độ tiếp: *"{nextLevel}"* không?'},"finish-dialog-win":{__desc__:"One of the lines in the next level dialog",en_US:"Awesome! You matched or exceeded our solution.",pt_BR:"Maravilha! Você fez uma solução tão boa quanto ou melhor que a nossa.",de_DE:"Wahnsinn! Du warst so gut wie unsere Lösung, oder sogar besser.",ja:"素晴らしい！このレベルをクリアしましたね",zh_CN:"太强了！你的答案符合标准答案甚至更好。",zh_TW:"太強了，您的答案符合我們的預期甚至更好！",es_AR:"¡Fabuloso! Igualaste o superaste nuestra solución.",es_ES:"¡Fabuloso! Igualaste o superaste nuestra solución.",gl:"¡Fabuloso! Fixécholo igual ou mellor ca nosa solución.",fr_FR:"Fabuleux ! Votre solution a égalé ou surpassé notre solution.",ru_RU:"Отлично! Ваше решение соответствует или превосходит наше.",uk:"Чудово! Твій розв’язок на рівні або кращий від нашого.",ko:"멋져요! 우리의 해답과 일치하거나 우리보다 좀 더 나은 해답입니다.",vi:"Tuyệt vời! Đáp án của bạn đạt chuẩn thâm chí có thể tốt hơn."},"finish-dialog-lose":{__desc__:"When the user entered more commands than our best, encourage them to do better",en_US:"See if you can whittle it down to {best} :D",de_DE:"Schau mal ob du es in {best} Schritten hinbekommst :D",ja:"模範解答の回数={best}回でクリアする方法も考えてみましょう :D",zh_CN:"试试看你能否在 {best} 步之内搞定 :D",zh_TW:"試試看您是否能在 {best} 步内搞定 :D",es_AR:"Fijate si podés bajarlo a usar sólo {best} comandos :D",es_ES:"Trata de usar sólo {best} comandos :D",pt_BR:"Veja se consegue reduzir para somente {best} :D",gl:"Mira se consigues reducir a solo {best} :D",fr_FR:"Voyons si vous pouvez descendre à {best} :D",ru_RU:"Попробуйте, может вы сможете уложиться в {best} : D",uk:"Спробуй, можливо ти зможеш вкластися в {best} кроків :D",ko:"{best}회로 줄일 수 있다면 해보세요. :D",vi:"Thử xem bạn có thể giảm xuống {best} không? :D"},"hg-prune-tree":{__desc__:"warning when pruning tree",en_US:"Warning! Mercurial does aggressive garbage collection and thus needs to prune your tree",zh_CN:"注意！ Mercurial 会进行主动垃圾回收，需要将你的提交树縮小。",zh_TW:"注意！ Mercurial 會積極地做垃圾收集，而且會因此把你的 tree 給縮小。",es_AR:"¡Cuidado! Mercurial hace garbage collection agresivamente y necesita eliminar tu árbol",es_ES:"¡Cuidado! Mercurial hace la recolección de basura agresivamente (para administrar memoria) y necesita podar tu árbol.",pt_BR:"Cuidado! O Mercurial faz coleção de lixo agressiva e precisa prunar sua árvore",gl:"¡Coidado! Mercurial fai que recolección de lixo agresivamente (para limpar memoria) e precisa podar a túa árbore.",fr_FR:"Attention, Mercurial supprime de façon agressive et nécessite un prune du repository",de_DE:"Achtung! Mercurial macht aggressive Garbage Collection und muss daher deinen Baum reduzieren",ru_RU:"Внимание! Mercurial использует агрессивный сборщик мусора и обрезает ваше дерево",uk:"Увага! Mercurial агресивно збирає сміття й може обрізати твоє дерево ",ko:"주의! Mercurial은 공격적으로 가비지 컬렉션을 수행하므로 트리를 정리할 필요가 있습니다.",vi:"Cảnh báo! Mercurial cần thực hiện thu gom rác và thu nhỏ cây lịch sử của bạn."},"hg-a-option":{__desc__:"warning for when using -A option",en_US:"The -A option is not needed for this app, just commit away!",zh_TW:"對於這個 app 來說，-A 選項並不是必須的，只需要 commit 就好！",zh_CN:"对本 App 而言，-A 选项并非必须项，直接 commit 就好！",es_AR:"La opción -A no es necesaria para esta aplicación, simplemente hacé commit",es_ES:"La opción -A no se necesita para este aplicación, sólo hace un commit!",pt_BR:"A opção -A não é necessária para este aplicativo, simplesmente faça commit",gl:"A opción -A non se necesita para este aplicativo, ¡fai só un commit!",de_DE:"Die Option -A wird in dieser Anwendung nicht benötigt, committe einfach!",fr_FR:"L'option -A n'est pas nécessaire pour cette application, simplement commiter",ru_RU:"Опция -A не требуется для этого приложения, просто сделайте коммит.",uk:"Опція -A не потрібна для цього застосунку, можна просто комітити!",ko:"이 앱에선 -A 옵션은 필요 없습니다. 그냥 커밋하세요!",vi:"Không cần thiết phải dùng tùy chọn -A trên ứng dụng này, cứ commit là được!"},"hg-error-no-status":{__desc__:"One of the errors for hg",en_US:"There is no status command for this app, since there is no staging of files. Try hg summary instead",zh_CN:"本 App 没有 status 命令哦，因为根本没有 stage 缓存文件。可以用 hg summary 代替哦",zh_TW:"本 App 没有 status 命令哦，因为根本没有 stage 缓存文件。可以用 hg summary 代替哦",es_AR:"No hay un comando status para esta aplicación, dado que no hay archivos que indexar. Probá hg summary, en cambio",es_ES:"No hay un comando status para esta aplicación, porque no hay archivos que indexar. Prueba el comando hg summary",pt_BR:"Não existe um comando status para este aplicativo, já que não há staging de arquivos. Tente hg summary",gl:"Non hai un comando status para esta aplicación, xa que non hai ficheiros que indexar. Proba hg summary",fr_FR:"Il n'y a pas de commande status pour cette application, car il n'y a pas de fichier stagé. Essayez hg summary à la place.",de_DE:"Es gibt keinen Befehl status in dieser Anwendung, da es kein Staging von Dateien gibt. Probier stattdessen hg summary",ru_RU:"Команда status не поддерживается в этом приложении, так как здесь нет файлов. Попробуйте выполнить hg summary",uk:"Команда status не підтримується в цьому застосунку, так як немає стейджингу(staging) файлів. Натомість спробуй hg summary ",ko:"이 앱을 위한 상태 명령어는 없습니다. 왜냐하면 파일들의 스테이징이 없기 때문입니다. 대신 hg summary를 시도해보세요.",vi:"Ứng dụng này không hỗ trợ lệnh `status` vì không có tệp nhớ đệm, thay vì đó hãy dùng lệnh `hg summary`"},"hg-error-need-option":{__desc__:"One of the errors for hg",en_US:"I need the option {option} for that command!",zh_CN:"我需要该命令使用 {option} 选项呢。",zh_TW:"我需要該命令使用 {option} 選項呢。",es_AR:"¡Necesito la opción {opcion} para ese comando!",es_ES:"¡Necesito la opción {opcion} para ese comando!",pt_BR:"Eu preciso da opção {option} para esse comando!",gl:"Preciso da opción {option} para ese comando!",fr_FR:"J'ai besoin de l'option {option} pour cette commande",de_DE:"Ich benötige die Option {option} für diesen Befehl!",ru_RU:"Для этой команды требуется опция {option}",uk:"Для цієї команди потрібна опція {option}",ko:"나는 그 명령어를 위한 {option} 옵션이 필요합니다.",vi:"Câu lệnh đó cần tùy chọn {option}!"},"hg-error-log-no-follow":{__desc__:"hg log without -f (--follow)",en_US:"hg log without -f is currently not supported, use -f",zh_CN:"暂不支持没有-f 选项的 hg log 命令，请补充 -f 选项吧",zh_TW:"暫不支持沒有-f 選項的 hg log 命令，請補充 -f 選項吧",es_AR:"hg log sin el parámetro -f no está soportado, usá -f",es_ES:"Actualmente hg log sin -f no es compatible con esta aplicación. Usa -f.",pt_BR:"hg log sem -f atualmente não é suportado, use -f",gl:"hg log sen -f actulamente non é soportado, usa -f",fr_FR:"hg log sans -f n'est pas supporté",de_DE:"hg log ohne -f wird aktuell nicht unterstützt, benutze bitte -f",ru_RU:"hg log без опции -f в настоящий момент не поддерживается, используйте -f",uk:"hg log без опції -f в данний момент не підтримується, використовуй -f",ko:"-f가 없는 hg log는 현재 지원되지 않습니다. -f를 사용하세요.",vi:"Hiện tại thì `hg log` mà không có tùy chọn -f chưa được hỗ trợ, hãy viết thêm -f."},"git-status-detached":{__desc__:"One of the lines for git status output",en_US:"Detached head!",de_DE:"Detached head!",zh_CN:"游离的 Head（Detached head）！",zh_TW:"分離 Head！",es_AR:"¡Detached HEAD!",es_ES:"¡HEAD separado! (Detached HEAD).",pt_BR:"Detached HEAD!",gl:"¡Detached HEAD!",fr_FR:"head détaché !",ru_RU:"Отделенный HEAD",uk:"Відокремлений HEAD",ko:"분리된 HEAD!",vi:"HEAD bị tách biệt!"},"git-status-onbranch":{__desc__:"One of the lines for git status output",en_US:"On branch {branch}",de_DE:"Auf Branch {branch}",zh_CN:"当前分支 {branch}",zh_TW:"切換到 branch {branch}",es_AR:"En la rama {branch}",es_ES:"En la rama {branch}",pt_BR:"No ramo {branch}",gl:"Non na rama {branch}",fr_FR:"Sur la branche {branch}",ru_RU:"В ветке {branch}",uk:"В гілці {branch}",ko:"분기 지점 {branch}에서",vi:"Đang trên nhánh {branch}"},"git-status-readytocommit":{__desc__:"One of the lines for git status output",en_US:"Ready to commit! (as always in this demo)",de_DE:"Fertig zum committen! (Wie immer in dieser Demo)",zh_CN:"可以提交啦！（在这个程序中无须修改文件，一直可以提交）",zh_TW:"準備 commit！（在這個 demo 裡面可以一直 commit）",es_AR:"¡Listo para commitear! (como siempre en esta demo ;-) )",es_ES:"¡Listo para hacer un commit (como siempre en esta demo)!",pt_BR:"Pronto para commitar! (como sempre neste demo ;-) )",gl:"¡Praparado para facer un commit (como sempre nesta demo ;-) )!",fr_FR:"Prêt à commit ! (comme toujours dans cette démo)",ru_RU:"Готово к коммиту! (как и всегда в этом демо)",uk:"Готово до коміту! (як завжди в цьому демо)",ko:"커밋을 준비하세요! (이 데모에서는 항상)",vi:"Sẵn sàng để commit! (khi demo thì luôn có thể commit)"},"git-dummy-msg":{__desc__:"The dummy commit message for all commits. Feel free to put in a shoutout to your school / city / whatever!",en_US:"Quick commit. Go Bears!",de_DE:"Schneller Commit. Eff-Zeh!",zh_CN:"快速提交。Coding 4ever！",zh_TW:"快速 commit。上啊熊！",es_AR:"Otro commit más, y van...",es_ES:"Hagamos un commit. Atlanta, Georgia! Escucha WHATUPRG también.",pt_BR:"Commitando.. Vai Timão!",gl:"Mesturando.. ¡Alá imos!",fr_FR:"Commit rapide. NoMaN Sux!",ru_RU:"Быстрый коммит. А надо!",uk:"Швидкий коміт. Динамо!",ko:"빨리 커밋하세요!",vi:"Commit luôn đi cho nóng!"},"git-error-origin-fetch-uptodate":{__desc__:"One of the error messages for git",en_US:"Already up to date!",de_DE:"Bereits aktuell!",fr_FR:"Déjà à jour",es_AR:"Estás en la versión más reciente",es_ES:"Ya actualizado con la versión más reciente.",pt_BR:"Já estamos na versão mais recente!",gl:"Xa estamos actualizados ca versión máis recente",zh_TW:"已經是最新的了",zh_CN:"已经是最新的了",ru_RU:"Уже обновлено!",uk:"Вже оновлено!",ko:"이미 최신 상태입니다!",vi:"Cập nhật mới nhất rồi!"},"git-error-origin-fetch-no-ff":{__desc__:"One of the error messages for git",en_US:"Your origin branch is out of sync with the remote branch and fetch cannot be performed",zh_CN:"你的 origin 仓库中的分支与远程分支的不同步了，无法执行 fetch 命令",zh_TW:"你的 origin 分支已經失去了與 remote 遠端分支的同步，所以無法執行 fetch 命令",de_DE:"Dein origin Branch ist nicht auf dem Stand des Remote Branch und fetch kann nicht ausgeführt werden",es_AR:"Tu rama origin está desincronizada con la rama remota, por lo que no se puede hacer el fetch",es_ES:"Tu rama origin no está sicronizada con la rama remota, así que el fetch no se puede realizar.",pt_BR:"O fetch não pode ser realizado pois o ramo de origem está fora de sincronia com o ramo remoto",gl:"O fetch non pode ser realizado xa que a rama de orixe non está sincronizada  ca rama remota",fr_FR:"Votre branche origin n'est plus synchronisée avec la branche distante et fetch ne peut pas être appliqué. Essayez avec l'option --force",ru_RU:"Ваша origin ветка не синхронизирована с удаленной веткой, невозможно выполнить fetch",uk:"Твоя гілка origin не синхронізована з віддаленою гілкою, неможливо виконати fetch",ko:"당신의 오리진 브랜치가 원격 브랜치와 동기화되지 않았고, 패치를 실행할 수 없습니다.",vi:"Nhánh của bạn không đồng bộ với nhánh remote nên lệnh fetch không thực thi được."},"git-error-origin-push-no-ff":{__desc__:"One of the error messages for git",en_US:"The remote repository has diverged from your local repository, so uploading your changes is not a simple fast forward (and thus your push was rejected). Please pull down the new changes in the remote repository, incorporate them into this branch, and try again. You can do so with git pull or git pull --rebase",zh_CN:"远程仓库与你的本地仓库产生了分歧，故此上传操作无法通过 Fast-forward 实现（因此你的 push 被拒绝了）。请 pull 下来远程仓库里最新的更改，与这个分支合并之后再试一次。你可以通过 git pull 或 git pull --rebase 实现。",zh_TW:"遠端倉庫與你的本地倉庫產生了分歧，故此上傳操作無法通過簡單地快進實現（因此你的 push 被拒絕了）。請 pull 下來遠端裡最新的更改，與本地合併之後再試一次。你可以通過 git pull 或 git pull --rebase 實現。",de_DE:"Das entfernte Repository weicht von deinem lokalen Repository ab, daher können deine Änderungen nicht mit einem einfachen fast forward hochgeladen werden (und daher ist dein push abgelehnt worden). Bitte pull erst die neuen Änderungen in das lokale Repository, integriere sie in den Branch und versuch es nochmal. Das kannst du mit git pull oder git pull --rebase machen",es_AR:"El repositorio remoto divergió de tu repositorio local, por lo que subir tus cambios no es un simple fast forward (y por eso se rechazó tu push). Por favor, hacé pull de los nuevos cambios en el repositorio remoto, incorporalos a esta rama y probá de nuevo. Podés hacerlo con git pull o git pull --rebase",es_ES:'El repositorio remoto se ha desviado del repositorio local. Subir cambios no es un avance en cámara rápida (por eso fue rechazado tu push). Por favor haz pull para descargar los cambios en el repositorio remoto para que los incorpores en la rama actual. Los cambios se pueden hacer pull con el comando "git pull" o "git pull --rebase"',pt_BR:"O repositório remoto divergiu do repositório local, então enviar suas mudanças não é um simples fast forward (e por isso seu push foi rejeitado). Por favor, faça pull das novas mudanças do repositório remoto, incorpore-os a este ramo, e tente novamente. Você pode fazê-lo com git pull ou git pull --rebase",gl:'O repositorio remoto diverxe do teu repositorio local. Subir os cambios non é un fast-forward (avance rápido) e por iso foi rechazado o teu push. Por favor, fai un pull dos novos cambios do repositorio remoto e inclúeos na túa rama actual. Os cambios pódense facer co comando "git pull" ou "git pull --rebase"',fr_FR:"Le dépôt distant a divergé de votre référentiel local, donc l'envoi de vos modifications n'est pas en simple avance rapide (et donc votre envoi a été rejeté). Veuillez récupérer les nouveaux changements depuis le dépôt distant, les intégrer dans cette branche, et essayez à nouveau. Vous pouvez le faire avec git pull ou git pull --rebase",ru_RU:"Удаленный репозиторий разошелся с вашим локальным репозиторием, поэтому выгрузка ваших изменений не может быть в режиме fast forward (и следовательно ваш push будет отклонён). Пожалуйста, удалите изменения в удаленном репозитории которые, объедините их в эту ветку и попробуйте еще раз. Вы можете сделать это с помощью git pull или git pull --rebase",uk:"Віддалений репозиторій розбігся з твоїм локальним репозиторієм, тому відвантаження твоїх змін не є простим fast forward (і тому твій push був відхилений). Будь-ласка, витягни зміни з віддаленого репозиторію, включи їх в цю гілку, й спробуй ще. Ти можеш зробити це за допомогою git pull чи git pull --rebase",ko:"원격 레포지토리가 당신의 로컬 레포지토리에서 분기하므로, 변경 사항을 업데이트 하는것은 간단한 fast forward가 아닙니다(따라서 push가 거절될 것입니다.). 원격 레포지토리에서의 변경 사항을 내려 받아 이 브랜치에 합치고, 이를 반복하세요. 당신은 git pull 또는 git pull --rebase를 사용해 이를 수행할 수 있습니다.",vi:"Kho chứa từ xa có sự khác biệt với kho chứa cục bộ của bạn, nên không thể tự động (fast forward) cập nhật thay đổi của bạn (và vì thế hoạt động push của bạn bị từ chối). Vui lòng kéo về thay đổi từ kho chứa từ xa, kết nạp vào nhánh hiện tại, và thử lại lần nữa. Bạn có thể dùng lệnh `git pull` hoặc `git pull --rebase`"},"git-error-remote-branch":{__desc__:"One of the error messages for git",en_US:"You cannot execute that command on a remote branch",zh_CN:"你不能在远程分支上执行这个命令。",zh_TW:"你不能在遠端分支上執行這個命令呀。",de_DE:"Du kannst diesen Befehl nicht auf einem Remote Branch ausführen",es_AR:"No podés ejecutar ese comando en una rama remota",es_ES:"No puedes ejecutar ese comando en una rama remota",pt_BR:"Você não pode executar esse comando em um ramo remoto",gl:"Non podes executar ese comando nunha rama remota",fr_FR:"Vous ne pouvez exécuter cette commande sur une branche distante",ru_RU:"Вы не можете выполнить эту команду на удаленной ветке",uk:"Ти не можеш виконати цю команду на віддаленій гілці",ko:"당신은 원격 브랜치에서 그 명령어를 실행시킬 수 없습니다.",vi:"Bạn không thể thực thi lệnh đó lên nhánh từ xa."},"git-error-origin-required":{__desc__:"One of the error messages for git",en_US:"An origin is required for that command",zh_CN:"该命令需要一个 origin",zh_TW:"該命令需要一個 origin",de_DE:"Für diesen Befehl wird origin benötigt",es_AR:"Necesitás un origen para ese comando",es_ES:"Se requiere un origen para ese comando.",pt_BR:"É necessário informar uma origem para esse comando",gl:"É necesario informar unha orixe para ese comando",fr_FR:"Une origine est requise pour cette commande",ru_RU:"Origin требуется для этой команды",uk:"Для цієї команди потрібний origin",ko:"그 명령어를 위한 오리진이 필요합니다.",vi:"Lệnh đó yêu cầu có origin."},"git-error-origin-exists":{__desc__:"One of the error messages for git",en_US:"An origin already exists! You cannot make a new one",zh_CN:"origin 已存在。你不能重复创建",zh_TW:"origin 遠端已存在。你不能重複創建",de_DE:"origin existiert bereits! Du kannst es nicht nochmal anlegen",es_AR:"¡Ya existe el origen! No podés crear uno nuevo",es_ES:"¡Ya existe un origen! No puedes crearlo de nuevo.",pt_BR:"A origem já existe! Você não pode criar uma nova",gl:"A orixe xa existe! Non podes crear unha nova",fr_FR:"Une origine existe déjà ! Vous ne pouvez pas en créer une nouvelle",ru_RU:"Origin уже существует! Невозможно создать еще один",uk:"Origin вже існує! Неможливо створити ще один",ko:"오리진이 이미 존재합니다! 당신은 새로 만들 수 없습니다.",vi:"Nguyên bản (origin) đã tồn tại. Bạn không thể tạo thêm 1 cái mới"},"git-error-branch":{__desc__:"One of the error messages for git",en_US:"You can't delete the master branch, the branch you are on, or things that aren't branches",de_DE:"Du kannst nicht den Branch master, den Branch auf dem du gerade arbeitest oder Refs, die keine Branches sind, löschen",zh_CN:"你不能删除主分支（master），或者你当前所在的分支，或者其它连分支也不是的东西。",zh_TW:"你不能刪除 master branch，或者你當前所在的 branch，或者其它連 branch 都不是的東西。",es_AR:"No podés borrar la rama master, la rama en la que estás, o cosas que no son ramas",es_ES:"No puedes eliminar la rama master, la rama en que estás, o cosas que no son ramas.",pt_BR:"Você não pode apagar o ramo master, nem o ramo em que você está, nem coisas que não sejam ramos",gl:"Non podes borrala rama master, nin a rama na que ti estás, nin cousas que non sexan ramas",fr_FR:"Vous ne pouvez supprimer la branche master, la branche sur laquelle vous êtes, ou ce qui n'est pas une branche",ru_RU:"Невозможно удалить ветку master, ветку на которой вы сейчас и то что не является веткой",uk:"Неможливо видалити гілку master, гілку на якій ти зараз знаходишся чи штуки які не є гілкою",ko:"당신은 마스터 브랜치, 당신이 현재 사용중인 브랜치, 또는 브랜치가 아닌 것들을 삭제할 수 없습니다.",vi:"Bạn không thể xóa nhánh master, nhánh mà bạn đang tham chiếu tới, hoặc những gì không phải nhánh."},"git-merge-msg":{__desc__:"The commit message for a merge commit",en_US:"Merge {target} into {current}",de_DE:"Mergen von {target} in {current}",zh_CN:"合并 {target} 到 {current}",zh_TW:"將 {target} 併入 {current}",es_AR:"Mergear {target} a {current}",es_ES:"Incorporar {target} en {current}",pt_BR:"Merge de {target} em {current}",gl:"Merge de {target} en {current}",fr_FR:"Merge de {target} dans {current}",ru_RU:"Слияние {target} в {current}",uk:"Злиття {target} в {current}",ko:"{target}을 {current}에 병합하세요.",vi:"Gộp {target} vào {current}."},"git-error-rebase-none":{__desc__:"One of the error messages for git",en_US:"No commits to rebase! Everything is a merge commit or changes already applied",de_DE:"Keine Commits für Rebase gefunden! Alle Commits sind Merge Commits oder beinhalten nur schon vorhandene Änderungen",zh_CN:"没有可以 rebase 的提交记录！可能是合并提交，或者已经 rebase 过了。",zh_TW:"沒有需要 rebase 的 commit！每個都是一個 merge commit 或者修改已經被寫入了",es_AR:"¡No hay commits para rebasear! Son todos commits de merge o cambios ya aplicados",es_ES:"¡No hay commits para hacer rebase! Todo es un merge commit o cambios ya hecho.",pt_BR:"Não há commits para o rebase! São todos commits de merge ou mudanças já aplicadas",gl:"¡Non hai commits para o rebase! Son todos commits de merge ou cambios xa aplicados",fr_FR:"Aucun commit à rebaser ! C'est soit un commit de merge, soit des modifications déjà appliquées",ru_RU:"Нет коммитов для rebase! Все в коммите слияния или изменения уже применены",uk:"Нема комітів для rebase! Все в коміті злиття (merge commit) чи зміни вже застосовані",ko:"rebase를 하기 위한 커밋이 없습니다! 모든 커밋과 변경 사항들의 병합은 이미 적용되었습니다.",vi:"Không có commit nào để rebase. Mọi thứ là merge commit hoặc thay đổi đã được áp dụng."},"git-result-nothing":{__desc__:"The message that explains the result of a git command",en_US:"Nothing to do...",de_DE:"Nichts zu tun ...",zh_CN:"什么也没发生...",zh_TW:"沒什麼事情要做...",es_AR:"Nada para hacer...",es_ES:"Nada para hacer...",pt_BR:"Nada a ser feito...",gl:"Nada para facer...",fr_FR:"Rien à effectuer…",ru_RU:"Нечего выполнять...",uk:"Нічого виконувати...",ko:"할게 없습니다 ...",vi:"Không có gì để làm ..."},"git-result-fastforward":{__desc__:"The message that explains the result of a git command",en_US:"Fast forwarding...",de_DE:"Fast forward...",zh_CN:"快速前进...",zh_TW:"快速前進...",es_AR:"Fast forwardeando...",es_ES:"Avanzando rápidamente...",pt_BR:"Fast forward...",gl:"Fast forward...",fr_FR:"En avance rapide…",ru_RU:"Выполняю Fast forward...",uk:"Виконую Fast forward",ko:"Fast forward 중입니다...",vi:"Đang fast forward..."},"git-result-uptodate":{__desc__:"The message that explains the result of a git command",en_US:"Branch already up-to-date",de_DE:"Branch ist bereits aktuell",zh_CN:"分支已经是最新啦",zh_TW:"branch 已經是最新啦",es_AR:"Rama actualmente actualizada",es_ES:"La rama ya se ha actualizado.",pt_BR:"Ramo já atualizado",gl:"Rama xa actualizada",fr_FR:"Branche déjà à jour",ru_RU:"Ветка уже обновлена",uk:"Гілку вже оновлено",ko:"브랜치가 이미 최신 상태입니다.",vi:"Nhánh đã được cập nhật mới nhất."},"git-error-exist":{__desc__:"One of the error messages for git",en_US:"The ref {ref} does not exist or is unknown",de_DE:"Die Ref {ref} existiert nicht oder ist unbekannt",zh_CN:"引用 {ref} 不存在。",zh_TW:"索引 {ref} 不存在，或者找不到。",es_AR:"La referencia {ref} no existe o es desconocida",es_ES:"La referencia {ref} no existe o es desconocida",pt_BR:"A referência {ref} não existe ou é desconhecida",gl:"A referencia {ref} non existe ou é descoñecida",fr_FR:"La référence {ref} n'existe pas ou est inconnue",ru_RU:"Ссылка {ref} не существует или неизвестна",uk:"Посилання {ref} не існує чи невідоме",ko:"{ref} 참조가 존재하지 않거나 알 수 없습니다.",vi:"Tham chiếu {ref} không tồn tại hoặc không thể tìm thấy."},"git-error-relative-ref":{__desc__:"One of the error messages for git",en_US:"Commit {commit} does not have a {match}",de_DE:"Commit {commit} hat kein {match}",zh_CN:"{commit} 提交并没有 {match}",zh_TW:"commit {commit} 並沒有 {match}",es_AR:"El commit {commit} no tiene un {match}",es_ES:"El commit {commit} no tiene un {match}",pt_BR:"O commit {commit} não tem um {match}",gl:"O commit {commit} non ten un {match}",fr_FR:"Le commit {commit} n'a pas de correspondance {match}",ru_RU:"Коммит {commit} не содержит {match}",uk:"Коміт {commit} не містить {match}",ko:"커밋 {commit}은 {match}를 가지고 있지 않습니다.",vi:"Commit {commit} mà không có {match}."},"git-warning-detached":{__desc__:"One of the warning messages for git",en_US:"Warning!! Detached HEAD state",de_DE:"Achtung! Detached HEAD Zustand",zh_CN:"警告！现在是分离 HEAD 状态",zh_TW:"注意喔！現在的狀態是分離 Head",es_AR:"¡Cuidado! Modo de detached HEAD",es_ES:"¡Cuidado! Modo de HEAD separado (detached HEAD)",pt_BR:"Cuidado! Modo Detached HEAD",gl:"¡Coidado! Modo Detached HEAD",fr_FR:"Attention ! HEAD est détaché",ru_RU:"Внимание! Репозиторий в состоянии detached HEAD, то есть не находится ни на какой ветке!",uk:"Увага! Репозиторій в стані detached HEAD, тобто не знаходиться в жодній гілці!",ko:"주의! 분리된 HEAD 상태",vi:"Cảnh báo! HEAD bị tách rời"},"git-warning-add":{__desc__:"One of the warning messages for git",en_US:"No need to add files in this demo",de_DE:"In dieser Demo müssen keine Dateien hinzugefügt werden",zh_CN:"此程序中不需要添加文件",zh_TW:"此 demo 中不需要再加入檔案",es_AR:"No es necesario hacer add a los archivos en esta demo",es_ES:"No es necesario agregar los archivos en esta demo",pt_BR:"Não é necessário adicionar arquivos neste demo",gl:"Non é necesario incluír arquivos nesta demo",fr_FR:"Aucun besoin d'ajouter des fichiers dans cette démo",ru_RU:"Это демо не оперирует файлами",uk:"Не потрібно додавати файли для цього демо",ko:"이 데모에서는 파일을 추가할 필요가 없습니다.",vi:"Không cần thêm tập tin trong bản giới thiệu này."},"git-error-options":{__desc__:"One of the error messages for git",en_US:"Those options you specified are incompatible or incorrect",de_DE:"Die angegebenen Optionen sind inkompatibel oder falsch",zh_CN:"你所指定的参数不兼容或者不准确",zh_TW:"您指定了不相容或錯誤的選項",es_ES:"Las opciones que especificaste son incompatibles o incorrectas.",es_AR:"No es necesario hacer add a los archivos en esta demo",pt_BR:"As opções que você especificou são incompatíveis ou incorretas",gl:"As opcións que especificaches son incompatibles ou incorrectas",fr_FR:"Les options que vous avez spécifiées sont incompatibles ou incorrectes",ru_RU:"Неправильные опции",uk:"Опції, які ти ввів, або некорректні або не підтримуються",ko:"당신이 지정한 그 옵션들은 호환되지 않거나 올바르지 않습니다.",vi:"Các tham số bạn chỉ định không tương thích hoặc không chính xác."},"git-error-already-exists":{__desc__:"One of the error messages for git",en_US:"The commit {commit} already exists in your changes set, aborting!",de_DE:"Der Commit {commit} existiert bereit, Abbruch!",zh_CN:"{commit} 提交已经存在于你的改动集里，已忽略！",zh_TW:"commit {commit} 已經在你的修改的集合裡，正在停止！",es_AR:"El commit {commit} ya existe en tus cambios, ¡abortando!",es_ES:"El commit {commit} ya existe en tus cambios, ¡abortando!",pt_BR:"O commit {commit} já existe nas suas mudanças, abortando!",gl:"O commit {commit} xa existe nos seus cambios, ¡abortando!",fr_FR:"Le commit {commit} existe déjà dans votre ensemble de modifications, opération avortée !",ru_RU:"Коммит {commit} существует, отменяю!",uk:"Коміт {commit} вже існує в твоєму change set, відміна!",ko:"커밋 {commit}은 이미 당신의 변경 내역에 존재합니다. 중단!",vi:"Commit {commit} đã tồn tại trong những thay đổi của bạn. Đang hủy!"},"git-error-reset-detached":{__desc__:"One of the error messages for git",en_US:"Can't reset in detached head! Use checkout if you want to move",de_DE:"Kann im Detached Head Zustand kein reset ausführen! Bitte checkout zum Bewegen benutzen",zh_CN:"不能在分离的 HEAD 里重置！用 checkout 吧",zh_TW:"不能在分離 HEAD 的狀態中重來！用 checkout 來移動吧",es_AR:"No podés hacer reset en el modo detached. Usá checkout si querés moverte",es_ES:"No puedes hacer reset en el modo separado. Usa checkout si quieres moverte.",pt_BR:"Não se pode fazer reset no modo detached. Use checkout se quiser se mover",gl:"Non se pode facer reset no modo detached. Use checkout se te queres mover",fr_FR:"On ne peut pas effectuer un reset quand HEAD est détaché. Utilisez checkout pour déplacer",ru_RU:"Это невозможно в режиме detached HEAD! Используйте checkout!",uk:"Неможливо зробити reset в стані detached head! Використовуй checkout якщо хочеш змінити розташування",ko:"분리된 HEAD에서 reset할 수 없습니다. 만약 이동시키기를 원한다면 checkout을 사용하세요.",vi:"Trong trạng thái tách rời `HEAD` thì không thể `reset`. Dùng `checkout` nếu bạn muốn di chuyển."},"git-warning-hard":{__desc__:"One of the warning messages for git",en_US:"The default behavior for resets on LearnGitBranching is a --hard, so feel free to omit that option if you get tired of typing it out in our lessons. Just remember that the default behavior on actual Git is --mixed.",de_DE:"Das Standardverhalten in dieser Demo ist --hard, du kannst die Option auch weglassen!",zh_CN:"在本程序中默认的行为是 --hard 硬重置，可以尽情省略掉那个选项以避免麻烦！但是要记录 Git 中默认的是 --mixed。",zh_TW:"預設的行為是 --hard reset，儘量省略掉那個選項吧！",es_AR:"El comportamiento default es un --hard reset, sentite libre de omitir esa opción!",es_ES:"El comportamiento default para reajustes es --hard, pero siéntete libre de omitir esa opción si te cansas de escribirla en nuestras lecciones. Recuerda quepor defecto el comportamiento en GitHub es --mixed.",pt_BR:"O comportamento padrão é um reset --hard, fique livre para omitir essa opção!",gl:"O comportamente por defecto é un reset --hard, Lembra que por defecto en GitHub é --mixed.",fr_FR:"Le comportement par défaut est un --hard reset, soyez libre d'omettre cette option !",ru_RU:"По умолчанию будет выполнен --hard reset, эту опцию можно опускать!",uk:"На LearnGitBranching reset по замовчуванню використовує --hard, тому цю опцію можна пропустити, якщо ти втомився її набирати щоразу. Тільки запам’ятай, що по замовчуванню звичайний git reset використовує --mixed",ko:"LearnGitBranching에서 reset의 기본 설정은 옵션은 --hard입니다. 우리 레슨에서는 이 옵션을 생략해도 됩니다. 다만 실제 Git의 기본 설정 옵션은 --mixed라는것만 기억하세요.",vi:'Trạng thái mặc định cho lệnh `reset` của "Học nhánh Git" là `--hard`. Nên khi làm bài nếu bạn thấy gõ tham số này hơi tốn công thì cứ bỏ qua. Nhưng mà hãy nhớ rằng thực tế thì `--mixed` mới là trạng thái mặc định của `reset`.'},"git-error-staging":{__desc__:"One of the error messages for git",en_US:"There is no concept of adding / staging files, so that option or command is invalid!",de_DE:"In dieser Demo gibt es kein Hinzufügen / Vormerken von Dateien, dieser Befehl ist daher ungültig!",zh_CN:"没有添加、缓存文件的必要，所以该选项或者命令是不合法的。",zh_TW:"沒有加入、或者暫存 (staging) 文件的必要，所以改選項或者命令是不合法的。",es_AR:"No existe el concepto de agregar/indexar cambios, así que esa opción o comando es inválido",es_ES:"No existe el concepto de agregar/indexar cambios, así que esa opción o comando es inválido.",pt_BR:"Não existe o conceito de adicionar/indexar mudanças, de forma que essa opção ou comando é inválida",gl:"Non existe o concepto de agregar/indexar cambios, así que esa opción ou comando é inválido.",fr_FR:"Il n'y a pas le concept d'ajouter / mettre en staging, donc cette option ou commande est invalide",ru_RU:"Это демо не работает с файлами, так что git add не нужен!",uk:"В цьому демо немає можливості додати файл до робочої копії чи до стейджингу, тому ця опція чи команда некоректна чи не підтримується",ko:"여기엔 파일을 추가하거나 스테이징한다는 개념이 없습니다. 따라서 그 옵션 또는 명령어는 유효하지 않습니다.",vi:"Không có khái nệm thêm tập tin đệm(staging file), nên tùy chọn đó là bất hợp lệ."},"git-revert-msg":{__desc__:"Message for reverting git command",en_US:"Reverting {oldCommit}: {oldMsg}",de_DE:"Reverte {oldCommit}: {oldMsg}",zh_CN:"撤销 {oldCommit}：{oldMsg}",zh_TW:"還原 {oldCommit}：{oldMsg}",es_AR:"Revirtiendo {oldCommit}: {oldMsg}",es_ES:"Volviendo a {oldCommit}: {oldMsg}",pt_BR:"Revertendo {oldCommit}: {oldMsg}",gl:"Revertindo {oldCommit}: {oldMsg}",fr_FR:"Revert {oldCommit}: {oldMsg}",ru_RU:"Откатываю {oldCommit}: {oldMsg}",uk:"Повертаю {oldCommit}: {oldMsg}",ko:"{oldCommit}:{oldMsg}를 복구중입니다.",vi:"Hoàn tác {oldCommit}:{oldMsg}."},"git-error-args-many":{__desc__:"One of the error messages for git",en_US:"I expect at most {upper} argument(s) for {what}",de_DE:"Ich benötige maximal {upper} Argument(e) für {what}",zh_CN:"{what} 期望最多 {upper} 个参数",zh_TW:"{what} 期望最多 {upper} 個參數",es_AR:"Espero como máximo {upper} parámetros para {what}",es_ES:"Espero al máximo {upper} parámetros para {what}.",pt_BR:"Espero no máximo {upper} parâmetros para {what}",gl:"Espero ó máximo {upper} parámetros para {what}",fr_FR:"J'attends au plus {upper} argument(s) pour {what}",ru_RU:"Ожидается максимум {upper} аргумент(ов) для {what}",uk:"Я очікую максимум {upper} аргумент(ів) для {what}",ko:"{what}을 위해 최대 {upper}개의 인자를 받습니다.",vi:"Có thể có nhiều nhất {upper} tham số cho {what}."},"git-error-args-few":{__desc__:"One of the error messages for git",en_US:"I expect at least {lower} argument(s) for {what}",de_DE:"Ich benötige mindestens {lower} Argument(e) für {what}",zh_CN:"{what} 期望最少 {lower} 个参数",zh_TW:"{what} 期望最少 {lower} 個參數",es_AR:"Espero al menos {lower} parámetros para {what}",es_ES:"Espero al menos {lower} parámetros para {what}.",pt_BR:"Espero pelo menos {lower} parâmetros para {what}",gl:"Agardo polo menos {lower} parámetros para {what}",fr_FR:"J'attends au moins {lower} argument(s) pour {what}",ru_RU:"Ожидается как минимум {lower} аргументов для {what}",uk:"Я очікую як мінімум {lower} аргумент(ів) для {what}",ko:"{what}을 위해 최소 {lower}개의 인자를 받습니다.",vi:"Cần ít nhất {lower} tham số cho {what}."},"git-error-no-general-args":{__desc__:"One of the error messages for git",en_US:"That command accepts no general arguments",de_DE:"Dieser Befehl akzeptiert keine allgemeinen Argumente",zh_CN:"该命令不接收参数",zh_TW:"該指令不接受一般參數",es_AR:"Ese comando no acepta parámetros comunes",es_ES:"Ese comando no acepta parámetros generales.",pt_BR:"Este comando não aceita parâmetros gerais",gl:"Este comando non acepta parámetros xeráis",fr_FR:"Cette commande n'accepte aucun argument général",ru_RU:"Это команда без аргументов",uk:"Ця команда не приймає загальних аргументів",ko:"그 명령어는 일반적으로 인자를 받지 않습니다.",vi:"Lệnh đó không chấp nhận các tham số chung."},"copy-tree-string":{__desc__:"The prompt to copy the tree when sharing",en_US:"Copy the tree string below",de_DE:"Kopiere die folgende Baum-Zeichenkette",zh_CN:"拷贝下面的树字符串",zh_TW:"複製下方的樹狀字串",es_AR:"Copiá el código de acá abajo",es_ES:"Copia el código que sigue.",pt_BR:"Copie o código abaixo",gl:"Copie o código abaixo",fr_FR:"Copiez la chaîne d'arbre ci-dessous",ru_RU:"Скопируй текст ниже",uk:"Скопіюй рядок дерева нижче",ko:"다음 트리 문자열을 복사하세요.",vi:"Sao chép chuỗi cây bên dưới."},"learn-git-branching":{__desc__:"The title of the app, with spaces",en_US:"Learn Git Branching",de_DE:"Learn Git Branching",ja:"日本語版リポジトリ",zh_CN:"学习 Git 分支",zh_TW:"學習 git 分支",es_AR:"Aprendé a Branchear en Git",es_ES:"Aprende Git Branching",pt_BR:"Learn Git Branching",gl:"Aprende Git Branching",fr_FR:"Apprenez Git Branching",ru_RU:"Изучаем ветвление в git",uk:"Learn Git Branching",ko:"깃 브랜칭을 배워봅시다.",vi:"Học nhánh Git."},"select-a-level":{__desc__:"The prompt to select a level on the drop down view",en_US:"Select a level",de_DE:"Level auswählen",zh_CN:"选择一关",zh_TW:"選擇其中一關",es_AR:"Seleccioná un nivel",es_ES:"Selecciona un nivel",pt_BR:"Selecione um nível",gl:"Selecciona un nivel",fr_FR:"Choisissez un niveau",ru_RU:"Выбери уровень",uk:"Обери рівень",ko:"레벨을 선택하세요.",vi:"Chọn một cấp độ."},"main-levels-tab":{__desc__:"The name of main levels tab on the drop down view",en_US:"Main",de_DE:"Haupt",zh_CN:"主要",zh_TW:"主要",es_ES:"Principal",gl:"Principal",ru_RU:"Основы",uk:"Основи",ko:"메인",vi:"Bài học chính"},"remote-levels-tab":{__desc__:"The name of remote levels tab on the drop down view",en_US:"Remote",de_DE:"Remote",zh_CN:"远程",zh_TW:"遠端",es_ES:"Remota",gl:"Remota",ru_RU:"Удаленные репозитории",uk:"Віддалені репозиторії",ko:"원격",vi:"Bài học về thao tác từ xa"},"branch-name-short":{__desc__:"When branch names get too long, we need to truncate them. This is the warning for that",en_US:'Sorry, we need to keep branch names short for the visuals. Your branch name was truncated to 9 characters, resulting in "{branch}"',de_DE:'Tut mir leid, aber aus Gründen der Darstellung müssen wir die Branch-Namen kurz halten. Dein Branch-Name wurde auf 9 Zeichen gekürzt und heißt daher jetzt "{branch}"',zh_CN:'抱歉，为了显示的需要，我们需要一个短些的分支名称。您使用的名称将被截断到9个字符，即 "{branch}"',zh_TW:'抱歉，為了顯示的需要，我們需要一個短一點的 branch 名稱。您使用的將會被截斷到剩下9個字元，即"{branch}"',es_AR:'Perdón, necesitamos mantener los nombres de los branches cortos para visualizarlos. El nombre de tu rama se truncó a 9 caracteres, resultando en "{branch}"',es_ES:'Perdón, necesitamos mantener los nombres de las ramas cortos para visualizarlos. El nombre de tu rama se truncó a 9 caracteres, resultando en "{branch}"',pt_BR:'Desculpe, precisamos manter os nomes dos ramos curtos para visualizá-los. O nome do seu ramo foi truncado para 9 caracteres, resultando em "{branch}"',gl:'Desculpe, precisamos manter os nomes das ramas curtas para poder velas. O nome da súa rama foi truncada a 9 letras, resultado en "{branch}"',fr_FR:'Désolé, nous devons garder les noms de branches courts pour la visualisation. Votre nom de branche a été tronqué à 9 caractères, devenant "{branch}"',ru_RU:'Для наглядности нам нужно сохранять имена веток короткими. Твоё название сокращено до 9 символов и теперь это "{branch}"',uk:'Вибач, нам потрібно щоб ім’я гілок було як можна коротше для наглядності. Твоє ім’я гілки було скорочене до 9 літер й тепер це "{branch}"',ko:'미안하지만, 우리는 시각적으로 더 좋게 보기위해 짧은 브랜치명이 필요합니다. 당신의 브랜치명은 9자리로 잘라 "{branch}"로 만들었습니다.',vi:'Xin lỗi, chúng tôi cần giữ tên nhánh ngắn để tiện minh họa. Tên nhánh của bạn đã bị cắt xuống 9 ký tự là "{branch}".'},"bad-branch-name":{__desc__:"When the user enters a branch name thats not ok",en_US:'That branch name "{branch}" is not allowed!',de_DE:'Der Branch-Name "{branch}" ist nicht erlaubt!',zh_CN:'不能给分支起这个名字 "{branch}"',zh_TW:'不能给 branch 起這個名字 "{branch}"',es_AR:'El nombre "{branch}" no está permitido para los branches',es_ES:'El nombre "{branch}" es prohibido para nombrar una rama.',pt_BR:'Um ramo não pode ser chamado de "{branch}"!',gl:'Unha rama non pode ser chamada "{branch}',fr_FR:'Ce nom de branche "{branch}" n\'est pas autorisé',ru_RU:'Название для ветки "{branch}" недопустимо!',uk:'Назва гілки "{branch}" є недопустимою',ko:'"{branch}"라는 브랜치명은 사용할 수 없습니다.',vi:'Tên nhánh "{branch}" không được chấp nhận.'},"bad-tag-name":{__desc__:"When the user enters a tag name thats not ok",en_US:'That tag name "{tag}" is not allowed!',zh_CN:"该标签名 “{tag}” 不被接受。",zh_TW:"該標籤名 “{tag}” 不被接受。",es_AR:'El nombre "{tag}" no está permitido para los tags',es_ES:'El nombre "{tag}" es prohibido para nombrar un tag.',pt_BR:'Uma tag não pode ser chamada de "{tag}"!',gl:'Unha etiqueta non pode ser chamada "{tag}"',de_DE:'Der Tag-Name "{tag}" ist nicht erlaubt!',fr_FR:'Le nom de tag "{tag}" n\'est pas autorisé',ru_RU:'Название для тега "{tag}" недопустимо!',uk:'Назва тегу "{tag}" є недопустимою',ko:'"{tag}"라는 태그명은 사용할 수 없습니다.',vi:'Tên thẻ "{tag}" không được chấp nhận.'},"option-not-supported":{__desc__:"When the user specifies an option that is not supported by our demo",en_US:'The option "{option}" is not supported!',de_DE:'Die Option "{option}" wird nicht unterstützt!',zh_CN:'不支持选项 "{option}"',zh_TW:'不支援的選項 "{option}"',es_AR:"La opción {option} no está soportada",es_ES:"La opción {option} no compatible con esta demo.",pt_BR:"A opção {option} não é suportada",gl:"A opción {option} non está soportada",fr_FR:"L'option \"{option}\" n'est pas supportée",ru_RU:'Опция "{option}" недопустима!',uk:'Опція "{option}" не підтримується!',ko:'"{option}"(이)라는 옵션은 지원하지 않습니다.',vi:'Tùy chọn "{option}" không được hỗ trợ.'},"git-usage-command":{__desc__:"The line that shows how to format a git command",en_US:"git <command> [<args>]",de_DE:"git <Befehl> [<Argumente>]",zh_CN:"git <命令> [<参数>]",zh_TW:"git <指令> [<參數>]",es_AR:"git <comando> [<parametros>]",es_ES:"git <comando> [<parametros>]",pt_BR:"git <comando> [<parâmetros>]",gl:"git <comando> [<parámetros>]",fr_FR:"git <commande> [<arguments>]",ru_RU:"git <команда> [<аргументы>]",uk:"git <команда> [<аргументи>]",ko:"git <명령어> [<인자들>]",vi:"git <lệnh> [<tham số>]"},"git-supported-commands":{__desc__:"In the git help command, the header above the supported commands",en_US:"Supported commands:",de_DE:"Unterstützte Befehle:",zh_CN:"支持的命令有:",zh_TW:"支援的指令有：",es_AR:"Comandos soportados:",es_ES:"Comandos compatibles:",pt_BR:"Comandos suportados:",gl:"Comandos soportados:",fr_FR:"Commandes supportées",ru_RU:"Поддерживаемые команды",uk:"Допустимі команди",ko:"지원되는 명령어들:",vi:"Các lệnh được hỗ trợ:"},"git-usage":{__desc__:"In the dummy git output, the header before showing all the commands",en_US:"Usage:",de_DE:"Benutzung:",zh_CN:"使用:",zh_TW:"用法：",es_AR:"Uso:",es_ES:"Uso:",pt_BR:"Uso:",gl:"Uso:",fr_FR:"Utilisation :",ru_RU:"Использование:",uk:"Використання:",ko:"사용법",vi:"Cách dùng:"},"git-version":{__desc__:"The git version dummy output, kind of silly. PCOTTLE is my unix name but feel free to put yours instead",en_US:"Git Version PCOTTLE.1.0",de_DE:"Git Version PCOTTLE.1.0.jbr",zh_CN:"Git 版本 PCOTTLE.1.0",zh_TW:"Git 版本 PCOTTLE.1.0",es_AR:"Git Versión PCOTTLE.1.0",es_ES:"Git Versión PCOTTLE.1.0",pt_BR:"Git versão PCOTTLE.1.0",gl:"Git versión PCOTTLE.1.0",fr_FR:"Git version PCOTTLE.1.0",ru_RU:"Версия git PCOTTLE.1.0",uk:"Версія git PCOTTLE.1.0",ko:"Git Version PCOTILE.1.0",vi:"Phiên bản Git TTC-Solutions.1.0"},"flip-tree-command":{__desc__:"when the tree is being flipped",en_US:"Flipping tree...",zh_CN:"翻转树中...",zh_TW:"翻轉樹中...",es_AR:"Invirtiendo el árbol...",es_ES:"Invirtiendo el árbol...",pt_BR:"Invertendo a árvore...",gl:"Invirtindo a árbore...",fr_FR:"Inversion de l'arbre...",ru_RU:"Переворачиваю дерево...",uk:"Перевертаю дерево...",ko:"트리 뒤집는중...",vi:"Cây lật..."},"refresh-tree-command":{__desc__:"when the tree is visually refreshed",en_US:"Refreshing tree...",de_DE:"Aktualisiere Baum ...",zh_CN:"正在刷新树结构...",zh_TW:"正在更新樹狀結構...",es_AR:"Refrezcando el árbol...",es_ES:"Actualizando el árbol...",pt_BR:"Atualizando a árvore...",gl:"Actualizando a árbore...",fr_FR:"Actualisation de l'arbre…",ru_RU:"Обновляю дерево...",uk:"Оновлюю дерево...",ko:"트리 다시 불러오는중...",vi:"Làm mới cây..."},"locale-command":{__desc__:"when the locale is set to something",en_US:"Locale set to {locale}",de_DE:"Locale auf {locale} gesetzt",zh_CN:"语言更改为 {locale}",zh_TW:"語系設為 {locale}",es_AR:"Localización actualizada a {locale}",es_ES:"Idioma puesto a {locale}",pt_BR:"Língua trocada para {locale}",gl:"Cambiado o idioma a {locale}",fr_FR:"Langue changée à {locale}",ru_RU:"Локаль теперь равна {locale}",uk:"Локаль тепер дорівнює {locale}",ko:"로케일이 {locale}로 설정되었습니다.",vi:"Ngôn ngữ được thay đổi thành {locale}."},"locale-reset-command":{__desc__:"when the locale is reset",en_US:"Locale reset to default, which is {locale}",de_DE:"Locale auf Standard zurückgesetzt, also {locale}",zh_CN:"语言重置为默认的 {locale}",zh_TW:"還原為預設語系 {locale}",es_AR:"Localización vuelta al default, que es {locale}",es_ES:"Idioma reajustado a su valor por defecto ({locale})",pt_BR:"Língua retornada para a padrão, que é {locale}",gl:"Lingua reaxustada ó seu valor por defecto {locale}",fr_FR:"Langue remise par défaut, qui est {locale}",ru_RU:"Локаль сброшена. Теперь она равна {locale}",uk:"Локаль скинута. Тепер вона дорівнює {locale}",ko:"로케일이 {locale}로 초기화 되었습니다.",vi:"Ngôn ngữ được đổi thành mặc định: {locale}."},"show-command":{__desc__:'command output title from "show"',en_US:"Please use one of the following commands for more info:",zh_TW:"請使用下列其中一個指令取得更多資訊：",zh_CN:"请使用以下命令以了解更多：",de_DE:"Bitte benutze einen der folgenden Befehle um mehr Informationen zu bekommen:",es_AR:"Usá alguno de estos comandos para tener más información:",es_ES:"Por favor usa uno de los siguientes comandos para más información:",pt_BR:"Use algum destes comandos para ter mais informações:",gl:"Usa algún destes comandos para ter máis información:",fr_FR:"Merci d'utiliser une des commandes suivantes pour obtenir plus d'informations",ru_RU:"Для получения большей информации используй следующие команды:",uk:"Щоб отримати більше інформації використовуй наступні команди:",ko:"더 많은 정보를 위해 다음 명령어들중 하나를 사용하세요.",vi:"Vui lòng dùng một trong các lệnh sau để có thêm thông tin:."},"show-all-commands":{__desc__:'command output title from "show commands"',en_US:"Here is a list of all the commmands available:",zh_TW:"這份清單列出所有可用指令：",zh_CN:"该列表列出了所有可用的指令：",de_DE:"Hier ist eine Liste aller verfügbarer Befehle:",es_AR:"Esta es una lista de los comandos disponibles:",es_ES:"Esta es una lista de todos los comandos disponibles:",pt_BR:"Esta é uma lista dos comandos disponíveis:",gl:"Esta é unha lista dos comando dispoñibles:",fr_FR:"Ci-dessous est la liste de toutes les commandes disponibles :",ru_RU:"Вот все поддерживаемуе команды:",uk:"Ось список всіх можливих команд:",ko:"여기에 사용 가능한 모든 명령어들의 리스트가 있습니다.",vi:"Dưới đây là danh sách tất cả các lệnh hiện hành:."},"cd-command":{__desc__:"dummy command output for the command in the key",en_US:'Directory changed to "/directories/dont/matter/in/this/demo"',de_DE:'Verzeichnis gewechselt zu "/verzeichnisse/sind/in/dieser/demo/latte"',zh_CN:'目录切换到 "/directories/dont/matter/in/this/demo"',zh_TW:'目錄切換到 "/directories/dont/matter/in/this/demo"',es_AR:'Directorio cambiado a "/los/directorios/no/importan/en/esta/demo"',es_ES:'Directorio cambiado a "/los/directorios/no/importan/en/esta/demo"',pt_BR:'Diretório mudado para "/diretorios/nao/importam/neste/demo"',gl:'Directorio cambiado a "/os/directorios/non/importan/nesta/demo"',fr_FR:'Répertoire changé à "/directories/dont/matter/in/this/demo" (les répertoires ne servent à rien dans cette démo)',ru_RU:'Директория изменена на "/директории/не/важны/в/этом/демо"',uk:'Директорія змінена на "/директорії/не/мають/значення/в/цьому/демо"',ko:'디렉토리가 "/directories/dont/matter/in/this/demo"로 변경되었습니다.',vi:'Thay đổi thư mục thành "/directories/dont/matter/in/this/demo".'},"ls-command":{__desc__:"Dummy command output for the command in the key",en_US:"DontWorryAboutFilesInThisDemo.txt",de_DE:"VergissDateienInDieserDemo.txt",zh_CN:"在本程序中无须考虑文件问题.txt",zh_TW:"DontWorryAboutFilesInThisDemo.txt （譯註：在 demo 裡不用擔心檔案）",es_AR:"NoTePreocupesPorLosArchivosEnEstaDemo.txt",es_ES:"NoTePreocupesPorLosArchivosEnEstaDemo.txt",pt_BR:"NaoSePreocupeComNomesDeArquivoNesteDemo.txt",gl:"NonTePreocupesPolosCambiosNestaDemo.txt",fr_FR:"DontWorryAboutFilesInThisDemo.txt (ne vous préoccupez pas des noms de fichier dans cette démo)",ru_RU:"НеНадоЗаботитьсяОФайлахВЭтомДемо.txt",uk:"ЗабийНаФайлиВЦьомуДемо.txt",ko:"DontWorryAboutFilesInThisDemo.txt (이_데모에서_파일에_대한_걱정은_하지마세요.txt)",vi:"DontWorryAboutFilesInThisDemo.txt (ĐừngLoLắngVềTậpTinTrongBảnGiớiThiệuNày.txt)"},"mobile-alert":{__desc__:"When someone comes to the site on a mobile device, they can not input commands so this is a nasty alert to tell them",en_US:"LGB can't receive input on mobile, visit on desktop! it's worth it :D",de_DE:"LGB ist nicht mit mobilen Endgeräten kompatibel, nutz es vom Desktop! Es lohnt sich :D",zh_CN:"无法在移动设备/平板上调出键盘 :( 请试试桌面版 :D",zh_TW:"無法在行動裝置上叫出鍵盤，請改用桌面版！",es_AR:"LGB no puede recibir comandos en dispositivos móviles. Visitanos desde una desktop, ¡lo vale! :D",es_ES:"LGB no puede recibir comandos en dispositivos móviles. Visítanos en una computadora de escritorio, ¡lo vale! :D",pt_BR:"Provavelmente você não vai conseguir digitar comandos no celular, neste caso tente acessar de um computador",gl:"LGB non pode recibir os comandos nos dispositivos móbiles. Visítanos dende un ordenador de escritorio, ¡paga a pena! :D",fr_FR:"Impossible de faire apparaître le clavier sur mobile / tablette :( Essayez de passer sur un ordinateur de bureau :D",ru_RU:"Мобильные не поддерживаются, зайди с компьютера!",uk:"LGB не підтримує ввід тексту з мобільного, зайди з компьютера! Це цього варте!",ko:"LGB는 모바일에서 입력을 받을 수 없습니다. 데스크톱으로 접속하세요! 이것은 가치가 있습니다. :D",vi:"Đáng tiếc là ứng dụng không thể nhận thông tin từ điện thoại hay máy tính bảng, hãy sử dụng máy tính cá nhân, đáng để bỏ công mà :D"},"share-tree":{__desc__:"When you export a tree, we want you to share the tree with friends",en_US:'Share this tree with friends! They can load it with "import tree"',de_DE:'Teile diesen git-Baum mit Freunden! Sie können ihn mit "import tree" laden',zh_CN:'与你的好友分享提交树！他们可以用 "import tree" 加载它',zh_TW:'與你的好友分享這棵樹！他們可以用 "import tree" 來載入它',es_AR:'¡Compartí este árbol con amigos! Pueden cargarlo con "import tree"',es_ES:'¡Comparte este árbol con amigos! Pueden cargarlo con "import tree"',pt_BR:'Compartilhe esta árvore com seus amigos! Eles podem carregá-la com "import tree"',gl:'¡Comparte esta árbore cos teus amigos! Eles poden cargalo con "import tree"',fr_FR:'Partagez cet arbre avec vos amis ! Ils peuvent le charger avec "import tree"',ru_RU:'Поделись деревом с друзьями! Они могут загрузить его при помощи "import tree"',uk:'Поділись цим деревом з друзями! Вони зможуть його завантажити за допомогою "import tree"',ko:'친구들과 이 트리를 공유하세요! 그들은 "import tree"를 사용해 이를 로드할 수 있습니다.',vi:'Hãy chia sẻ cây này với bạn của mình! Họ có thể dùng "import tree" để tải.'},"paste-json":{__desc__:"When you are importing a level or tree",en_US:"Paste a JSON blob below!",de_DE:"Füg einen JSON-Blob unten ein!",zh_CN:"在下边粘贴一个 JSON 串",zh_TW:"在下方貼上一串 JSON",es_AR:"¡Pegá un blob JSON abajo!",es_ES:"¡Pega un blob JSON abajo!",pt_BR:"Cole o JSON abaixo!",gl:"Pega un JSON abaixo!",fr_FR:"Collez un blob JSON ci-dessous !",ru_RU:"Вставь JSON ниже!",uk:"Встав JSON нижче!",ko:"아래에 JSON blob을 붙여넣으세요.",vi:"Dán một chuỗi JSON xuống bên dưới."},"solved-map-reset":{__desc__:"When you reset the solved map to clear your solved history, in case someone else wants to use your browser",en_US:"Solved map was reset, you are starting from a clean slate!",de_DE:"Gelöste Karte wurde zurückgesetzt, du fängst mit einem leeren Blatt an!",zh_CN:"解决列表已重置，您现在可以从头开始了",zh_TW:"過關地圖已經重新設置，您現在從零開始了",es_AR:"El mapa resuelto fue eliminado, estás arrancando desde un estado limpio",es_ES:"El mapa resuelto fue eliminado, estás empezando de un estado limpio.",pt_BR:"Mapa de resolvidos descartado, você está começando com ficha limpa!",gl:"O mapa resolto foi eliminado, estás arrancando dende un estado limpo.",fr_FR:"La carte des niveaux résolus a été effacée, vous repartez de zéro !",ru_RU:"Всё сброшено! Можно начать с чистого листа!",uk:"Все скинуте! Можна починати з чистого аркушу!",ko:"해결된 지도가 초기화 되었습니다. 당신은 깨끗한 상태에서 시작합니다.",vi:"Tất cả đáp án đã được xóa, bạn có thể bắt đầu lại từ đầu."},"level-cant-exit":{__desc__:"When the user tries to exit a level when they are not in one",en_US:'You are not in a level! You are in a sandbox, start a level with "levels"',de_DE:'Du bist nicht in einem Level! Du bist im Sandkasten-Modus, starte einen Level mit "levels"',zh_CN:'您没在关卡中而是在沙盒中，要开始关卡请输入 "levels"',zh_TW:'您沒在關卡中！您在沙盒中，要開始關卡請輸入 "levels"',es_AR:'¡No estás en un nivel! Estás en el sandbox, comenzá un nivel usando "levels"',es_ES:'¡No estás en un nivel! Estás en el sandbox, comienza un nivel con "levels"',pt_BR:'Você não está em um nível! Você está no sandbox, comece um nível com "levels"',gl:'¡Non estás en ningún nivel! Estás nunha caixa de arena, comeza un nivel usando "levels"',fr_FR:'Vous n\'êtes pas dans un niveau ! Vous êtes dans le mode bac à sable, commencez un niveau avec "levels"',ru_RU:'Ты не проходишь уровень! Ты в песочнице! Чтобы начать уровень, используй команду "levels"!',uk:'Ти не в рівні! Ти в пісочниці! Почни рівень з "levels"',ko:'당신은 샌드박스에 있습니다. "levels"를 사용하여 레벨을 시작하세요.',vi:'Bạn hiện không ở cấp độ nào cả! Hãy bắt đầu một cấp độ với "levels".'},"level-no-id":{__desc__:"When you say an id but that level doesn't exist",en_US:'A level for that id "{id}" was not found! Opening up a level selection view',de_DE:'Konnte keinen Level mit der ID "{id}" finden! Öffne einen Level-Auswahldialog',zh_CN:'没找到 id 为 "{id}" 的关卡！打开关卡选择框',zh_TW:'找不到 id 為 "{id}" 的關卡！開啟關卡選擇視窗',es_AR:"No se encontró ningún nivel {id}. Abriendo la vista de selección de niveles...",es_ES:"No se encontró ningún nivel {id}. Abriendo la vista de selección de niveles...",pt_BR:'O nível "{id}" não existe! Abrindo uma caixa de seleção de nível',gl:'O nivel "{id}" non existe! Abrindo unha caixa de seleción de nivel',fr_FR:"Le niveau dont l'identifiant est {id} n'a pas été trouvé ! Ouverture de la vue de sélection des niveaux",ru_RU:'Уровень с id "{id}" не найден! Открываю выбор уровней',uk:'Рівень з id "{id}" не знайдений! Відкриваю вибір рівней',ko:'id "{id}"에 대한 레벨이 존재하지 않습니다. 레벨 선택 화면을 열어보세요.',vi:'Không tìm thấy cấp độ cho định danh "{id}". Mở cửa sổ chọn cấp độ.'},"undo-stack-empty":{__desc__:"The undo command can only undo back until the last time the level was reset or the beginning of the level",en_US:"The undo stack is empty!",de_DE:"Die Undo-Liste ist leer!",zh_CN:"还没有什么可以撤销",zh_TW:"還沒有什麼可以取消",es_AR:"No hay comandos que deshacer",es_ES:"No hay comandos que deshacer",pt_BR:"Você já desfez tudo!",gl:"Nonn hai comandos que desfacer",fr_FR:"La pile d'annulation est vide !",ru_RU:"Некуда откатывать!",uk:"Нема куди відкатуватися",ko:"되돌리기 스택이 비었습니다!",vi:"Không có gì để hoàn tác!"},"already-solved":{__desc__:"When you play in a level that is already solved",en_US:'You have already solved this level, try other levels with "levels" or go back to sandbox with "sandbox"',de_DE:'Du hast diesen Level bereits gelöst, probier einen anderen Level mit "levels" aus oder geh in den Sandkasten-Modus mit "sandbox"',zh_CN:'你已经解决了本关，输入 "levels" 尝试其他关卡，或者输入 "sandbox" 回到沙盒中',zh_TW:'你已經解决了本關，輸入 "levels" 嘗試其他關卡，或者輸入 "sandbox" 回到沙盒中',es_AR:'Ya resolviste este nivel, probá otros usando "levels" o volvé al sandbox usando "sandbox"',es_ES:'Ya resolviste este nivel, prueba otros usando "levels" o vuelve al sandbox usando "sandbox"',pt_BR:'Você já resolveu este nível, tente outros com "levels" ou volte ao sandbox com "sandbox"',gl:'Xa resolviches este nivel, proba outros usando "levels" ou volve á caixa de area con "sandbox"',fr_FR:'Vous avez déjà résolu ce niveau, essayez d\'autres niveaux avec "levels" ou revenez au bac à sable avec "sandbox"',ru_RU:'Ты уже прошел этот уровень, попробуй пройти другие при помощи команды "levels" или иди в песочницу "sandbox"',uk:'Ти вже пройшов цей рівень, спробуй інші рівні з "levels" чи повернись в пісочницю з "sandbox"',ko:'당신은 이미 이 레벨을 해결했습니다. "levels"를 사용하여 다른 레벨에 도전하거나 "sandbox"를 사용하여 샌드박스로 돌아가세요.',vi:'Bạn đã vượt qua cấp độ này. Thử cấp độ khác với "levels" hoặc dùng "sandbox" để trở lại hộp cát.'},"solved-level":{__desc__:"When you solved a level",en_US:"Solved!!\n:D",de_DE:"Gelöst!\n:D",zh_CN:"恭喜过关！！",zh_TW:"恭喜，本關解決了！！",es_ES:"¡Resuelto!\n:D",gl:"¡Resolto!",ru_RU:"Решено!!\n:D",uk:"Вирішено!!\n:D",ko:"해결 완료!!\n:D",vi:"ĐÃ XONG!!\n:D"},"command-disabled":{__desc__:"When you try a command that is disabled",en_US:"That git command is disabled for this level!",de_DE:"Dieser git-Befehl ist für diesen Level deaktiviert!",zh_CN:"本关不允许使用该命令！",zh_TW:"本關禁止使用該 git 指令！",es_AR:"¡Ese comando de git está deshabilitado para este nivel!",es_ES:"¡Ese comando de git está deshabilitado para este nivel!",pt_BR:"Achou que seria fácil assim? Desabilitamos esse comando durante este nível, só para dificultar ;-)",gl:"¡Ese comando de git está deshabilitado para este nivel!",fr_FR:"Cette commande git est désactivée pour ce niveau !",ru_RU:"На этом уровне нельзя использовать эту команду!",uk:"На цьому рівні не можна використовувати цю команду!",ko:"그 Git 명령어는 이 레벨에서 사용할 수 없습니다.",vi:"Ở cấp độ này thì lệnh git đó bị vô hiệu hóa."},"share-json":{__desc__:"when you have made the level, prompt to share this",en_US:"Here is the JSON for this level! Share it with someone or send it to me on Github",de_DE:"Hier ist das JSON für diesen Level! Teil es mit jemandem or schick es mir über Github",zh_CN:"这是一个关卡定义 JSON ！您可以分享它或者发到我的 Github 上",zh_TW:"這是本關的 JSON！您可以分享給別人，或是送到 Github 上給我",es_AR:"Este es el JSON de este nivel. Compartilo con quien quieras o mandámelo por Github",es_ES:"Este es el JSON de este nivel. Compártelo con quien quieras o mandámelo por Github.",pt_BR:"Aqui está o JSON para este nível! Compartilhe com alguém ou me envie pelo Github",gl:"Este é o JSON deste nivel. Comparteo con quen queiras ou mándao por Github",fr_FR:"Voici le JSON pour ce niveau ! Partagez-le avec quelqu'un ou envoyez-le moi sur Github",ru_RU:"Вот JSON для этого уровня! Поделись им с кем-нибудь или отправь его нам на GitHub",uk:"Ось JSON для цього рівня! Поділись з кимось чи відправ мені його на Github",ko:"이 레벨을 위한 JSON 데이터가 있습니다! 이를 다른 사람들과 공유하거나 Github에서 제게 보내보세요.",vi:"Đây là chuỗi JSON cho cấp độ này! Hãy chia sẻ với người khắc hoặc với tôi qua Github."},"want-start-dialog":{__desc__:"prompt to add a start dialog",en_US:"You have not specified a start dialog, would you like to add one?",de_DE:"Du hast noch keinen Einführungs-Dialog geschrieben, willst du einen hinzufügen?",zh_CN:"您还没有定义一开始的介绍，是否添加一个？",zh_TW:"尚未指定開始對話視窗，是否立即新增？",es_AR:"No especificaste un mensaje de inicio, ¿querés agregar uno?",es_ES:"No especificaste un mensaje de inicio, ¿quieres agregar uno?",pt_BR:"Você não especificou uma mensagem de início, quer colocar uma?",gl:"Non especificaches unha mensaxe de incio. ¿queres agregar un?",fr_FR:"Vous n'avez pas spécifié de dialogue de départ, voulez-vous en ajouter un ?",ru_RU:"Не указано стартово сообщение! Точно продолжаем?",uk:"Не вказано стартовий діалог, хочеш додати стартовий діалог?",ko:"당신은 시작 대화창을 지정하지 않았습니다. 추가 하시겠습니까?",vi:"Không có cửa sổ hội thoại được chỉ định, thêm một cái chứ?"},"want-hint":{__desc__:"prompt to add a hint",en_US:"You have not specified a hint, would you like to add one?",de_DE:"Du hast noch keinen Hinweis geschrieben, magst du einen hinzufügen?",zh_CN:"您还没有定义提示，是否添加一个？",zh_TW:"尚未指定提示，是否立即新增？",es_AR:"No especificaste ninguna pista, ¿querés agregar alguna?",es_ES:"No especificaste ninguna pista, ¿quieres agregar alguna?",pt_BR:"Você não especificou uma dica, quer colocar uma?",gl:"Ti non especificaches unha pista, ¿queres agregar algunha?",fr_FR:"Vous n'avez pas spécifié d'indice, voulez-vous en ajouter un ?",ru_RU:"Не указана подсказка для уровня! Пренебречь? Вальсируем?",uk:"Не вказана підказка, хочеш додати підказку?",ko:"당신은 힌트를 지정하지 않았습니다. 추가 하시겠습니까?",vi:"Bạn chưa chỉ định một gợi ý, thêm một cái chứ?"},"prompt-hint":{__desc__:"prompt for hint",en_US:"Enter the hint for this level, or leave this blank if you do not want to include one",de_DE:"Gib den Hinweis für diesen Level an, oder lass es leer wenn du keinen hinzufügen willst",zh_CN:"请输入关卡提示，如果没有请留空",zh_TW:"請輸入關卡提示，或者故意留空",es_AR:"Ingresá una pista para este nivel, o dejalo en blanco si no querés incluir ninguna",es_ES:"Ingresa una pista para este nivel, o déjalo en blanco si no quieres incluir ninguna.",pt_BR:"Colocque uma dica para este nível, ou deixe em branco se não quiser incluir",gl:"Ingresa unha pista para este nivel, ou déixao en branco se non a queres incluír.",fr_FR:"Entrez l'indice pour ce niveau, ou laissez-le vide pour ne pas l'inclure",ru_RU:"Введи подсказку для уровня, если хочешь.",uk:"Додай підказку для рівня, якщо хочеш",ko:"이 레벨을 위한 힌트를 입력하거나 만약 이를 포함시키고 싶지 않을 경우엔 비워두세요.",vi:"Thêm một gợi ý cho cấp độ này, hoặc cứ để trống nếu bạn không muốn thêm."},"prompt-name":{__desc__:"prompt for level name",en_US:"Enter the name for the level",de_DE:"Gib den Namen für diesen Level an",zh_CN:"请输入关卡名称",zh_TW:"請輸入關卡名稱",es_AR:"Ingresá el nombre del nivel",es_ES:"Ingresa el nombre del nivel.",pt_BR:"Coloque o nome do nível",gl:"Coloque o nome do nivel",fr_FR:"Entrez le nom pour ce niveau",ru_RU:"Введи название уровня",uk:"Введи назву рівня",ko:"레벨 이름을 입력하세요.",vi:"Nhập tên cho cấp độ này."},"solution-empty":{__desc__:"If you define a solution without any commands, aka a level that is solved without doing anything",en_US:"Your solution is empty!! Something is amiss",de_DE:"Deine Auflösung ist leer! Hier fehlt etwas",zh_CN:"你的解法是空的!! 可能是程序出错了",zh_TW:"您的解法是空的！這一定是哪裡出錯了",es_AR:"¡Tu solución está vacía! Algo hay que hacer",es_ES:"¡Tu solución está vacía! Algo hay que hacer.",pt_BR:"Sua solução está vazia! O aprendiz deveria ter que fazer alguma coisa",gl:"¡Su solución está vacía! Algo haberá que facer.",fr_FR:"Votre solution est vide !! Quelque chose ne tourne pas rond",ru_RU:"Решение не указано! Так не годится!",uk:"Розв’язок порожній!! Щось не так",ko:"해답이 비어있습니다. 무언가 잘못되었습니다.",vi:"Đáp án bị bỏ trống!! Có gì thiếu rồi."},"define-start-warning":{__desc__:"When you define the start point again, it overwrites the solution and goal so we add a warning",en_US:"Defining start point... solution and goal will be overwritten if they were defined earlier",de_DE:"Lege Start fest ... Auflösung und Ziel werden gelößcht, falls sie schon festgelegt worden waren",zh_CN:"定义开始点... 解决方法和目标会被新的替代",zh_TW:"正在定義起始點...先前定義的解法和目標會被覆蓋掉",es_AR:"Estableciendo el punto de inicio... La solución y el objetivo serán sobreescritos si ya habían sido definidos",es_ES:"Estableciendo el punto de inicio... La solución y el objetivo serán sobreescritos si ya habían sido definidos.",pt_BR:"Esbelecendo o ponto de início... a solução e o objetivo serão sobrescritos caso já existirem",gl:"Establecendo o punto de inicio... A solución e o obxectivo serán sobreescritos se xa foron definidos.",fr_FR:"Redéfinition du point de départ… la solution et la cible seront écrasés s'ils ont déjà été définis",ru_RU:"Устанавливаю стартовую точку... Решение и итоговое состояние будут стёрты, если они указаны ранее",uk:"Встановлюю стартову точку... розв’язок та ціль будуть переписані якщо вони були задані раніше",ko:"시작 지점을 정의하세요... 만약 그것이 먼저 정의된다면 해답과 목표가 덮어씌워질 것입니다.",vi:"Xác định điểm bắt đầu ... Các giải pháp và mục tiêu sẽ được thay thế nếu đã được chỉ định từ trước."},"help-vague-level":{__desc__:"When you are in a level and you say help, its vague and you need to specify",en_US:'You are in a level, so multiple forms of help are available. Please select either "help level" to learn more about this lesson, "help general" for using Learn GitBranching, or "objective" to learn about how to solve the level.',de_DE:'Du befindest dich in einem Level, daher gibt es verschiedene Hilfen. Gib "help level" ein um mehr úber diesen Level zu erfahren, "help general" um zu sehen wie Learn Git Branching bedient wird, oder "objective" um das Ziel dieses Levels zu erfahren.',zh_CN:'您正在关卡中，这里有多种形式的帮助，请选择 "help level" (关卡帮助)或 "help general" (一般帮助)',zh_TW:'您正在進行關卡中，這裡有多種不同型式的幫助，請選擇 "help level" 來了解這個關卡，或者是選擇 "help general" 來學習如何使用 Learn GitBranching，或者是選擇 "objective" 來學習如何解決這個關卡',es_AR:'Estás en un nivel, por lo que hay varios tipos de ayuda. Por favor elegí entre "help level" para aprender algo más sobre esta lección, "help general" para ayuda sobre el uso de Learn GitBranching, o "objective" para aprender a resolver este nivel.',es_ES:'Estás en un nivel, por lo que hay varios tipos de ayuda. Por favor elige "help level" para aprender más sobre esta lección, "help general" para ayuda sobre el uso de Learn GitBranching, o "objective" para aprender a resolver este nivel.',pt_BR:'Você está em um nível, então há vários tipos de ajuda. Selecione "help level" para aprender mais sobre esta lição, "help general" para aprender a usar o Learn GitBranching, ou "objective" ver como resolver o nível.',gl:'Estás nun nivel, entón hai varios tipos de axuda. Selecione "help level" para aprender máis sobre esta lección, "gelp general" para aprender a usar o Learn Git Branching, ou "objective" para ver como resolver o nivel.',fr_FR:'Vous êtes dans un niveau, donc plusieurs formes d\'aide sont disponibles. Merci de sélectionner soit "help level" pour en apprendre plus sur cette leçon, "help general" pour l\'utilisation de Learn GitBranching, ou "objective" pour apprendre comment résoudre le niveau',ru_RU:'При прохождении уровня доступны несколько видов помощи. Определить что нужно: "help level" чтобы получить информацию об этом уровне, "help general" для того, чтобы узнать о игре в целом или "objective" чтобы узнать что надо сделать в этом уровне.',uk:'При проходженні рівня доступні декілька різновидів допомоги. Виберіть або "help level" щоб взнати більше про цей рівень, чи "help general" щоб взнати більше про Learn Git Branching, чи "objective" щоб дізнатись більше про проходження цього рівня',ko:'당신은 한 레벨에 들어가 있고, 여러가지 도움 양식들을 사용할 수 있습니다. 레슨에 대해 더 알고싶을 땐 "help level", LearnGitBranching을 사용하고 싶을 땐 "help general", 또는 레벨을 어떻게 해결해야할지 알고싶을 땐 "objective"를 선택하세요.',vi:'Bạn đang ở trong một cấp độ, nên sẽ có nhiều hỗ trợ. Vui lòng dùng "help level" để biết thêm về bài học này, "help general" để sử dụng HọcNhánhGit, hoặc "objective" để biết cách giải quyết bài tập.'},"help-vague-builder":{__desc__:"When you are in a level builder, the help command is vague so you need to specify what you mean",en_US:'You are in a level builder, so multiple forms of help are available. Please select either "help general" or "help builder"',de_DE:'Du befindest dich im Level-Editor, daher gibt es verschiedene Hilfen. Gib bitte "help general" oder "help builder" ein',zh_CN:'您正在进行关卡构建中，这里有多种形式的帮助，请选择 "help general" (一般帮助)或 "help builder" (关卡构建帮助)',zh_TW:'您正在進行關卡構建中，這裡有多種不同型式的幫助，請選擇 "help general" （一般幫助）或 "help builder" （製造關卡的幫助）',es_AR:'Estás en el constructor de niveles, por lo que hay varios tipos de ayuda. Elegí entre "help general" para ayuda sobre Learn GitBranching y "help builder" para ayuda sobre el constructor de niveles',es_ES:'Estás en un constructor de niveles, por lo que hay varios tipos de ayuda. Elige "help general" para ayuda sobre Learn GitBranching o "help builder" para ayuda sobre el constructor de niveles',pt_BR:'Você está no construtor de nívels, então há vários tipos de ajuda. Selecione "help general" ou "help builder"',gl:'Estás no constructor de niveis, polo que hai varios tipos de axuda. Elixe "help general" ou "help builder"',fr_FR:'Vous êtes dans l\'éditeur de niveaux, donc plusieurs formes d\'aide sont disponibles. Merci de sélectionner soit "help general" soit "help builder"',ru_RU:'При создании уровней доступны несколько видов помощи. Выбери между "help general" и "help builder"',uk:'При створенні рівня доступні декілька різновидів допомоги. Виберіть або "help general", чи "help builder"',ko:'당신은 한 레벨 생성기에 들어가 있고, 여러가지 도움 양식들을 사용할 수 있습니다. "help general" 또는 "help builder"를 선택해주세요.',vi:'Bạn đang tạo một cấp độ, nên sẽ có nhiều trợ giúp có sẵn. Vui lòng chọn "help general" hoặc "help builder".'},"show-goal-button":{__desc__:"button label to show goal",en_US:"Show Goal",de_DE:"Ziel anzeigen",zh_TW:"顯示目標",zh_CN:"显示目标",fr_FR:"Afficher les cibles",pt_BR:"Mostrar objetivo",gl:"Amosar obxectivo",es_AR:"Mostrar objetivo",es_ES:"Mostrar objetivo",ja:"ゴールを表示",ru_RU:"Цель уровня",uk:"Ціль рівня",ko:"목표 보기",vi:"Hiển thị mục tiêu"},"hide-goal-button":{__desc__:"button label to hide goal",en_US:"Hide Goal",de_DE:"Ziel verstecken",fr_FR:"Cacher les cibles",zh_TW:"隱藏目標",zh_CN:"隐藏目标",pt_BR:"Ocultar objetivo",gl:"Ocultar obxectivo",es_AR:"Ocultar objetivo",es_ES:"Ocultar objetivo",ja:"ゴールを隠す",ru_RU:"Спрятать цель",uk:"Сховати ціль",ko:"목표 숨기기",vi:"Ẩn mục tiêu"},"objective-button":{__desc__:"button label to show objective",en_US:"Instructions",de_DE:"Ziel",zh_TW:"提示",zh_CN:"提示",es_ES:"Objetivo",gl:"Obxectivo",ru_RU:"Задача",uk:"Задача",ko:"목적",vi:"Chỉ dẫn"},"git-demonstration-title":{__desc__:"title of git demonstration window",en_US:"Git Demonstration",de_DE:"Git Demonstration",zh_TW:"Git示範",zh_CN:"Git示范",es_ES:"Demostración de Git",gl:"Demostración de Git",ru_RU:"Git демо",uk:"Git демо",ko:"Git 데모",vi:"Trình diễn Git"},"goal-to-reach":{__desc__:"title of window that shoes the goal tree to reach",en_US:"Goal To Reach",de_DE:"Ziel",zh_CN:"目标",zh_TW:"目標",es_AR:"Objetivo a cumplir",es_ES:"Objetivo a cumplir",pt_BR:"Objetivo a cumprir",gl:"Obxectivo a cumprir",fr_FR:"Cible à atteindre",ja:"到達目標",ru_RU:"Цель уровня",uk:"Ціль рівня",ko:"목표",vi:"Mục tiêu cần đạt"},"goal-only-master":{__desc__:"the helper message for the window that shows the goal tree when the goal will only be compared using the master branch",en_US:'<span class="fwber">Note:</span> Only the master branch will be checked in this level. The other branches are simply for reference (shown as dashed labels below). As always, you can hide this dialog with "hide goal"',fr_FR:'<span class="fwber">Note:</span> Dans ce niveau on ne doit faire de git checkout que sur la branche master. Les autres branches représentées ici (entourées d\'un cadre en tirets) doivent être utilisées uniquement comme références. Comme toujours, vous pouvez cacher cette fenêtre avec "Cacher les objectifs"',de_DE:'<span class="fwber">Hinweis:</span> In diesem Level wird nur der Branch master geprüft. Die anderen Branches dienen nur als Vergleichsbasis (als gestrichelte Bezeichner dargestellt). Wie immer kannst du diese Meldung mit "hide goal" ausblenden',es_AR:'<span class="fwber">Nota:</span> Sólo la rama master va a ser chequeada en este nivel. Las otras ramas sólo son para referencia. Como siempre, podés ocultar este mensaje con "hide goal"',es_ES:'<span class="fwber">Nota:</span> Sólo la rama master va a ser inspeccionado en este nivel. Las otras ramas sólo son para referencia (etiquetados abajo con guion). Siempre puedes ocultar este mensaje con "hide goal."',pt_BR:'<span class="fwber">Nota:</span> Apenas o ramo master será verificado neste nível. Os outros ramos (dentro das caixas clareadas) são somente para referência. Como sempre, você pode ocultar esta janela com "hide goal"',gl:'<span class="fwber">Nota:</span> Só a rama master será verificada neste nivel. As outras ramas (dentro das caixas clareadas) son soamente de referencia. Coma sempre, podes ocultar está ventá con "hide goal"',zh_CN:'<span class="fwber">注意:</span>本关卡中，只检查 master 分支，其他分支只是用作 reference 存在（以虚线标签表示）。照常，你可以用 “hide goal” 来隐藏此窗口。',zh_TW:'在這個關卡中，只有 master branch 會被檢查，別的 branch 只是用來做為 reference （下面用虛線符號表示）。一如往常，你可以利用 "hide goal" 來隱藏這個對話視窗',ja:'<span class="fwber">Note:</span> masterブランチだけをこのlevelではチェックします。その他のブランチ（以下では、破線で示されています）に関しては、参照のためにあります。また、いつでもこのウィンドウは"hide goal"と打つかクリックで閉じれます',ru_RU:'<span class="fwber">Важно:</span> В этом уровне проверяется только ветка master. Остальные ветки просто для наглядности. Как обычно, можно скрыть это сообщение при помощи "hide goal"',uk:'<span class="fwber">Важливо:</span> В цьому рівні буде перевірятися тільки гілка master. Решта гілок тільки для наглядності (показані пунктиром нижче). Як завжди, можна сховати цей діалог за допомогою "hide goal"',ko:'<span class="fwber">Note:</span> 이 레벨에선 오직 마스터 브랜치만이 검사될 것입니다.. 다른 브랜치들은 단순히 참고용입니다. (아래에 대시 라벨로 보여집니다.). "hide goal"을 사용하여 언제든지 창을 숨길 수 있습니다.',vi:'<span class="fwber">Chú ý:</span> Ở cấp độ này chỉ nhánh master bị kiểm tra. Các nhánh khác chỉ dùng để tham chiếu(có dấu - ở nhãn). Như thường lệ, bạn có thể ẩn mục tiêu bằng "hide goal".'},"hide-goal":{__desc__:"the helper message for the window that shows the goal tree",en_US:'You can hide this window with "hide goal"',de_DE:'Du kannst diese Meldung mit "hide goal" ausblenden',zh_CN:'你可以通过 "hide goal" 命令关闭这个窗口',zh_TW:'你可以透過 "hide goal" 關閉這個視窗',es_AR:'Podés ocultar esta ventana con "hide goal"',es_ES:'Puedes ocultar esta ventana con "hide goal."',pt_BR:'Você pode ocultar esta janela com "hide goal"',gl:'Podes ocultar esta ventá con "hide goal"',fr_FR:'Vous pouvez masquer cette fenêtre avec "Cacher les cibles"',ja:'このウィンドウは"hide goal"と打つかクリックで閉じれます',ru_RU:'Можно скрыть это окно при помощи "hide goal"',uk:'Можна сховати це вікно за допомогою "hide goal"',ko:'"hide goal"을 사용하여 이 창을 숨길 수 있습니다.',vi:'Bạn có thể ẩn cửa sổ này với "hide goal".'},"hide-start":{__desc__:"The helper message for the window that shows the start tree for a level",en_US:'You can hide this window with "hide start"',de_DE:'Du kannst diese Meldung mit "hide start" ausblenden',zh_CN:'你可以通过 "hide start" 命令关闭这个窗口',zh_TW:'你可以透過 "hide start" 關閉這個視窗',es_AR:'Podés ocultar esta ventana con "hide start"',es_ES:'Puedes ocultar esta ventana con "hide start."',pt_BR:'Você pode ocultar esta janela com "hide start"',gl:'Podes ocultar esta ventá con "hide start"',fr_FR:'Vous pouvez masquer cette fenêtre avec "hide start"',ja:'このウィンドウは"hide start"かクリックで閉じれます',ru_RU:'Можно скрыть это окно при помощи "hide start"',uk:'Можна сховати це вікно за допомогою "hide start"',ko:'"hide start"를 사용하여 이 창을 숨길 수 있습니다.',vi:'Bạn có thể ẩn cửa sổ này với "hide start".'},"level-builder":{__desc__:"The name for the environment where you build levels",en_US:"Level Builder",de_DE:"Level-Editor",zh_CN:"关卡生成器",zh_TW:"關卡產生器",es_AR:"Constructor de niveles",es_ES:"Constructor de niveles",pt_BR:"Construtor de níveis",gl:"Constructor de nivéis",fr_FR:"Éditeur de niveaux",ja:"Levelエディタ",ru_RU:"Редактор уровней",uk:"Редактор рівнів",ko:"레벨 생성기",vi:"Trình tạo câp độ"},"no-start-dialog":{__desc__:"when the user tries to open a start dialog for a level that does not have one",en_US:"There is no start dialog to show for this level!",de_DE:"Es gibt keinen Einführungs-Dialog für diesen Level!",zh_CN:"这个关卡没有介绍！",zh_TW:"這關沒有介紹!",es_AR:"¡No hay mensaje de inicio para este nivel!",es_ES:"¡No hay mensaje de inicio para este nivel!",pt_BR:"Não há mensagem de início para este nível!",gl:"¡Non hai mensaxe de inicio para este nivel!",fr_FR:"Il n'y a aucun dialogue de départ à afficher pour ce niveau !",ja:"このLevelにはスタートダイアログが存在しません",ru_RU:"Нет стартового сообщение для уровня!",uk:"Немає початкового діалогу для цього рівня!",ko:"이 레벨을 위한 시작 대화창이 없습니다.",vi:"Cấp độ này không được giới thiệu."},"no-hint":{__desc__:"when no hint is available for a level",en_US:"Hmm, there doesn't seem to be a hint for this level :-/",de_DE:"Hm, es gibt anscheinend keinen Hinweis für diesen Level :-/",zh_CN:"呃……，这关好像没有提示 :-/",zh_TW:"嗯‧‧‧這關沒有提示 :-/",es_AR:"Mmm... Pareciera no haber pistas para este nivel :-/",es_ES:"Mmm... Parece que no hay pistas para este nivel. :-/",pt_BR:"Hmm, não existe nenhuma pista para este nível :-/",gl:"Hmm, non existe ningunha pista para este nivel :-/",fr_FR:"Hum, il ne semble pas y avoir d'indice pour ce niveau :-/",ja:"あらら、このLevelでは、残念ながらヒントが存在しません :-/",ru_RU:"Милый мой, хороший, догадайся сам :-/ Подсказка не создана...",uk:"Хм, схоже для цього рівня немає підказки :-/",ko:"흠, 이 레벨을 위한 힌트가 없어보이는군요.",vi:"Hmmm, có vẻ cấp độ này không có gợi ý rồi. :-/"},"error-untranslated-key":{__desc__:"This error happens when we are trying to translate a specific key and the locale version is mission",en_US:"The translation for {key} does not exist yet :( Please hop on github and offer up a translation!",de_DE:"Die Übersetzung für {key} existiert noch nicht :( Falls du eine hast, bitte teil sie mit auf Github mit!",zh_CN:"还没翻译 {key} :( 请在 Github 上贡献您的翻译!",zh_TW:"還沒翻譯 {key} :( 請在 Github 上貢獻您的翻譯!",es_AR:"Aún no hay traducción para {key} :( ¡Metete en Github y sugerí una! :)",es_ES:"Aún no hay traducción para {key}. :( ¡Métete en Github y sugiere una! :)",pt_BR:"Não existe tradução para {key} :( Pule no Github e sugira uma! :)",gl:"Non existe tradución para {key} :( Axúdanos en Github e suxire unha! :)",fr_FR:"La traduction pour {key} n'existe pas encore :( Venez sur Github pour en offrir une !",ja:"{key}の翻訳がまだ存在しません :( GitHubでの、翻訳の協力をお願いします m(_)m",ru_RU:"Перевода для {key} не создано :( Пожалуйста, предложи перевод на GitHub",uk:"Немає перекладу для {key} :( Будь-ласка, запропонуй переклад на Github",ko:"{key}를 위한 번역은 아직 존재하지 않습니다 :( 번역에 참여해주세요!",vi:"Bản dịch cho {key} không có rồi :( Nếu có thể thì hãy lên dự án của chúng tôi ở Github để cung cấp bản dịch!"},"error-untranslated":{__desc__:"The general error when we encounter a dialog that is not translated",en_US:"This dialog or text is not yet translated in your locale :( Hop on github to aid in translation!",de_DE:"Dieser Dialog oder Text ist noch nicht in deine Sprache übersetzt. :( Schau auf Github vorbei um bei der Übersetzung zu helfen!",zh_CN:"这段对话还没有被翻译成您的语言 :( 欢迎在 Github 上贡献您的翻译!",zh_TW:"這段對話尚未翻成您的語言 :( 歡迎到 Github 貢獻翻譯！",es_AR:"Este mensaje o texto aún no fue traducido a tu idioma :( ¡Metete en Github y ayudanos a traducirlo!",es_ES:"Este mensaje o texto aún no fue traducido a tu idioma. :( ¡Métete en Github y ayúdanos a traducirlo!",pt_BR:"Esta mensagem ou texto não foi traduzida para Português :( Ajude-nos a traduzir no Github!",gl:"Esta mensaxe ou texto non foi traducida ó teu idioma :( Axúdanos a traducir a web en Github, é moi doado!",fr_FR:"Ce message n'a pas encore été traduit dans votre langue :( Venez sur Github aider à la traduction !",ja:"このダイアログ、またはテキストの翻訳がまだ存在しません :( GitHubでの、翻訳の協力をお願いします m(_)m",ru_RU:"Для этого сообщения нет перевода :( Пожалуйста, предложи перевод на GitHub",uk:"Для цього повідомлення ще немає перекладу :( Будь-ласка, запропонуй переклад на Github",ko:"이 대화창이나 텍스트는 아직 번역되지 않았습니다. :( 번역에 참여해주세요!",vi:"Hội thoại hoặc văn bản này chưa được dịch ra ngôn ngữ của bạn rồi. :( Hãy lên Github để cung cấp bản dịch!"}}},{}],61:[function(e,t,o){e("backbone");var n=e("q"),a=e("../util"),i=e("../app"),r=e("../intl"),s=e("../util/errors"),c=e("../visuals/visualization").Visualization,m=(e("../level/parseWaterfall").ParseWaterfall,e("../level").Level),l=e("../stores/LocaleStore"),u=e("../stores/LevelStore"),d=(e("../models/commandModel").Command,e("../git/gitShim").GitShim,e("../views/multiView").MultiView,e("../views").CanvasTerminalHolder),h=e("../views").ConfirmCancelTerminal,p=(e("../views").NextLevelConfirm,e("../views/builderViews").MarkdownPresenter),g=e("../views/builderViews").MultiViewBuilder,f=(e("../views/builderViews").MarkdownGrabber,{"define goal":/^define goal$/,"define name":/^define name$/,"help builder":/^help builder$/,"define start":/^define start$/,"edit dialog":/^edit dialog$/,"show start":/^show start$/,"hide start":/^hide start$/,"define hint":/^define hint$/,finish:/^finish$/}),b=a.genParseCommand(f,"processLevelBuilderCommand"),v=m.extend({initialize:function(t){(t=t||{}).level={},this.options=t;var o=l.getLocale();t.level.startDialog={},t.level.startDialog[o]={childViews:r.getDialog(e("../dialogs/levelBuilder"))},t.editLevel&&(u.getLevel(t.editLevel),t.level=void 0),v.__super__.initialize.apply(this,[t]),t.editLevel?(this.startDialogObj=(void 0).startDialog[o],this.definedGoal=!0):(this.startDialogObj=void 0,this.definedGoal=!1),delete this.treeCompare,delete this.solved},initName:function(){},initGoalData:function(){this.options.editLevel||(this.level.goalTreeString='{"branches":{"master":{"target":"C1","id":"master"},"makeLevel":{"target":"C2","id":"makeLevel"}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"},"C2":{"parents":["C1"],"id":"C2"}},"HEAD":{"target":"makeLevel","id":"HEAD"}}',this.level.solutionCommand="git checkout -b makeLevel; git commit"),v.__super__.initGoalData.apply(this,arguments)},minimizeGoal:function(e,t){this.doBothVis("hide"),this.goalWindowPos=e,this.goalWindowSize=t,$("#goalPlaceholder").is(":visible")&&($("#goalPlaceholder").hide(),this.mainVis.myResize())},doBothVis:function(e){this.startVis&&this.startVis[e].call(this.startVis),this.goalVis&&this.goalVis[e].call(this.goalVis)},resizeGoal:function(){this.doBothVis("myResize")},initStartVisualization:function(){return this.startCanvasHolder=new d({parent:this,additionalClass:"startTree",text:r.str("hide-start")}),this.startVis=new c({el:this.startCanvasHolder.getCanvasLocation(),containerElement:this.startCanvasHolder.getCanvasLocation(),treeString:this.level.startTree,noKeyboardInput:!0,smallCanvas:!0,noClick:!0}),this.startCanvasHolder},startOffCommand:function(){i.getEventBaton().trigger("commandSubmitted","echo :D")},objectiveDialog:function(e,t){var o=[e,t,void 0===this.startDialogObj?null:{startDialog:{en_US:this.startDialogObj}}];v.__super__.objectiveDialog.apply(this,o)},initParseWaterfall:function(e){v.__super__.initParseWaterfall.apply(this,[e]),this.parseWaterfall.addFirst("parseWaterfall",b),this.parseWaterfall.addFirst("instantWaterfall",this.getInstantCommands())},buildLevel:function(e,t){this.exitLevel(),setTimeout((function(){i.getSandbox().buildLevel(e,t)}),1.5*this.getAnimationTime())},getInstantCommands:function(){return[[/^help$|^\?$/,function(){throw new s.CommandResult({msg:r.str("help-vague-builder")})}]]},takeControl:function(){i.getEventBaton().stealBaton("processLevelBuilderCommand",this.processLevelBuilderCommand,this),v.__super__.takeControl.apply(this)},releaseControl:function(){i.getEventBaton().releaseBaton("processLevelBuilderCommand",this.processLevelBuilderCommand,this),v.__super__.releaseControl.apply(this)},showGoal:function(){this.hideStart(),v.__super__.showGoal.apply(this,arguments)},showStart:function(e,t){this.hideGoal(),this.showSideVis(e,t,this.startCanvasHolder,this.initStartVisualization)},resetSolution:function(){this.gitCommandsIssued=[],this.level.solutionCommand=void 0},hideStart:function(e,t){this.hideSideVis(e,t,this.startCanvasHolder)},defineStart:function(e,t){this.hideStart(),e.addWarning(r.str("define-start-warning")),this.resetSolution(),this.level.startTree=this.mainVis.gitEngine.printTree(),this.mainVis.resetFromThisTreeNow(this.level.startTree),this.showStart(e,t)},defineGoal:function(e,t){if(this.hideGoal(),!this.gitCommandsIssued.length)return e.set("error",new s.GitError({msg:r.str("solution-empty")})),void t.resolve();this.definedGoal=!0,this.level.solutionCommand=this.gitCommandsIssued.join(";"),this.level.goalTreeString=this.mainVis.gitEngine.printTree(),this.initGoalVisualization(),this.showGoal(e,t)},defineName:function(e,t){this.level.name={en_US:prompt(r.str("prompt-name"))},e&&e.finishWith(t)},defineHint:function(e,t){this.level.hint={en_US:prompt(r.str("prompt-hint"))},e&&e.finishWith(t)},editDialog:function(e,t){var o=n.defer();this.currentBuilder=new g({multiViewJSON:this.startDialogObj,deferred:o}),o.promise.then(function(e){this.startDialogObj=e}.bind(this)).fail((function(){})).done((function(){e?e.finishWith(t):t.resolve()}))},finish:function(e,t){if(!(this.options.editLevel||this.gitCommandsIssued.length&&this.definedGoal))return e.set("error",new s.GitError({msg:r.str("solution-empty")})),void t.resolve();for(;!this.level.name;)this.defineName();var o=n.defer(),a=o.promise;if(void 0===this.level.hint){var i=n.defer();a=a.then((function(){return i.promise})),new h({markdowns:[r.str("want-hint")]}).getPromise().then(this.defineHint.bind(this)).fail(function(){this.level.hint={en_US:""}}.bind(this)).done((function(){i.resolve()}))}if(void 0===this.startDialogObj){var c=n.defer();a=a.then((function(){return c.promise})),new h({markdowns:[r.str("want-start-dialog")]}).getPromise().then(function(){var e=n.defer();return this.editDialog(void 0,e),e.promise}.bind(this)).fail((function(){})).done((function(){c.resolve()}))}a=a.done(function(){new p({fillerText:JSON.stringify(this.getExportObj(),null,2),previewText:r.str("share-json")}),e.finishWith(t)}.bind(this)),o.resolve()},getExportObj:function(){var e=Object.assign({},this.level);return delete e.startDialog,this.startDialogObj&&(e.startDialog={en_US:this.startDialogObj}),e},processLevelBuilderCommand:function(e,t){var o={"define goal":this.defineGoal,"define start":this.defineStart,"show start":this.showStart,"hide start":this.hideStart,finish:this.finish,"define hint":this.defineHint,"define name":this.defineName,"edit dialog":this.editDialog,"help builder":v.__super__.startDialog};if(!o[e.get("method")])throw new Error("woah we don't support that method yet");o[e.get("method")].apply(this,arguments)},afterCommandDefer:function(e,t){e.resolve()},die:function(){this.hideStart(),v.__super__.die.apply(this,arguments),delete this.startVis,delete this.startCanvasHolder}});o.LevelBuilder=v,o.regexMap=f},{"../app":44,"../dialogs/levelBuilder":48,"../git/gitShim":53,"../intl":59,"../level":63,"../level/parseWaterfall":64,"../models/commandModel":68,"../stores/LevelStore":80,"../stores/LocaleStore":81,"../util":88,"../util/errors":85,"../views":98,"../views/builderViews":95,"../views/multiView":100,"../visuals/visualization":111,backbone:1,q:19}],62:[function(e,t,o){var n=e("../intl"),a=e("../commands"),i=e("../util/errors").GitError;function r(e){e=e||{},this.disabledMap=e.disabledMap||{"git cherry-pick":!0,"git rebase":!0}}r.prototype.getInstantCommands=function(){var e=[],t=function(){throw new i({msg:n.str("command-disabled")})};return Object.keys(this.disabledMap).forEach(function(o){o=o.slice("git".length+1);var n=a.commands.getRegexMap().git[o];if(!n)throw new Error("wuttttt this disbaled command"+o+" has no regex matching");e.push([n,t])}.bind(this)),e},o.DisabledMap=r},{"../commands":45,"../intl":59,"../util/errors":85}],63:[function(e,t,o){var n=e("q"),a=e("react"),i=e("react-dom"),r=e("../util"),s=e("../app"),c=e("../intl"),m=e("../log"),l=e("../util/errors"),u=e("../sandbox/").Sandbox,d=e("../actions/GlobalStateActions"),h=e("../stores/GlobalStateStore"),p=e("../actions/LevelActions"),g=e("../stores/LevelStore"),f=e("../visuals/visualization").Visualization,b=e("../level/disabledMap").DisabledMap,v=e("../git/gitShim").GitShim,w=e("../commands"),y=e("../views/multiView").MultiView,k=e("../views").CanvasTerminalHolder,C=e("../views").ConfirmCancelTerminal,A=e("../views").NextLevelConfirm,x=e("../react_views/LevelToolbarView.jsx"),M=e("../graph/treeCompare"),_={"help level":/^help level$/,"start dialog":/^start dialog$/,"show goal":/^(show goal|goal|help goal)$/,"hide goal":/^hide goal$/,"show solution":/^show solution($|\s)/,objective:/^(objective|assignment)$/},D=r.genParseCommand(_,"processLevelCommand"),E=u.extend({initialize:function(e){(e=e||{}).level=e.level||{},this.level=e.level,this.gitCommandsIssued=[],this.solved=!1,this.wasResetAfterSolved=!1,this.initGoalData(e),this.initName(e),this.on("minimizeCanvas",this.minimizeGoal),this.on("resizeCanvas",this.resizeGoal),this.isGoalExpanded=!1,E.__super__.initialize.apply(this,[e]),this.startOffCommand(),this.handleOpen(e.deferred)},getIsGoalExpanded:function(){return this.isGoalExpanded},handleOpen:function(e){e=e||n.defer(),!this.level.startDialog||this.testOption("noIntroDialog")?setTimeout((function(){e.resolve()}),1.2*this.getAnimationTime()):new y(Object.assign({},c.getStartDialog(this.level),{deferred:e}))},objectiveDialog:function(e,t,o){if(!(o=void 0===o?this.level:o)||!o.startDialog)return e.set("error",new l.GitError({msg:c.str("no-start-dialog")})),void t.resolve();var n=$.extend({},c.getStartDialog(o));n.childViews=n.childViews.slice(-1),new y(Object.assign(n,{deferred:t})),t.promise.then((function(){e.set("status","finished")}))},startDialog:function(e,t){if(!this.level.startDialog)return e.set("error",new l.GitError({msg:c.str("no-start-dialog")})),void t.resolve();this.handleOpen(t),t.promise.then((function(){e.set("status","finished")}))},getEnglishName:function(){return this.level.name.en_US},initName:function(){var e=c.getName(this.level);this.levelToolbar=a.createElement(x,{name:e,onGoalClick:this.toggleGoal.bind(this),onObjectiveClick:this.toggleObjective.bind(this),parent:this}),i.render(this.levelToolbar,document.getElementById("levelToolbarMount"))},initGoalData:function(e){if(!this.level.goalTreeString||!this.level.solutionCommand)throw new Error("need goal tree and solution")},takeControl:function(){s.getEventBaton().stealBaton("processLevelCommand",this.processLevelCommand,this),E.__super__.takeControl.apply(this)},releaseControl:function(){s.getEventBaton().releaseBaton("processLevelCommand",this.processLevelCommand,this),E.__super__.releaseControl.apply(this)},startOffCommand:function(){var e=this.options.command.get("method");this.testOption("noStartCommand")||"importLevelNow"===e||s.getEventBaton().trigger("commandSubmitted","hint; delay 2000; show goal")},initVisualization:function(e){this.mainVis=new f({el:e.el||this.getDefaultVisEl(),treeString:e.level.startTree})},initGoalVisualization:function(){var e=M.onlyMasterCompared(this.level);return this.goalCanvasHolder=new k({text:e?c.str("goal-only-master"):void 0,parent:this}),this.goalVis=new f({el:this.goalCanvasHolder.getCanvasLocation(),containerElement:this.goalCanvasHolder.getCanvasLocation(),treeString:this.level.goalTreeString,noKeyboardInput:!0,smallCanvas:!0,isGoalVis:!0,levelBlob:this.level,noClick:!0}),this.goalVis.customEvents.on("drag",function(e,t){t.position.left>.5*$(window).width()?$("#goalPlaceholder").is(":visible")||($("#goalPlaceholder").show(),this.mainVis.myResize()):$("#goalPlaceholder").is(":visible")&&($("#goalPlaceholder").hide(),this.mainVis.myResize())}.bind(this)),this.goalCanvasHolder},minimizeGoal:function(e,t){this.isGoalExpanded=!1,this.trigger("goalToggled"),this.goalVis.hide(),this.goalWindowPos=e,this.goalWindowSize=t,$("#goalPlaceholder").is(":visible")&&($("#goalPlaceholder").hide(),this.mainVis.myResize())},resizeGoal:function(){this.goalVis&&this.goalVis.myResize()},showSolution:function(t,o){var a=this.level.solutionCommand,i=function(){this.isShowingSolution=!0,s.getEventBaton().trigger("commandSubmitted",a),m.showLevelSolution(this.getEnglishName())}.bind(this),r=t.get("rawStr");if(this.testOptionOnString(r,"noReset")||(a="reset --forSolution; "+a),this.testOptionOnString(r,"force"))return i(),void t.finishWith(o);var l=n.defer(),u=c.getDialog(e("../dialogs/confirmShowSolution"))[0],d=new C({markdowns:u.options.markdowns,deferred:l});l.promise.then(i).fail((function(){t.setResult("")})).done((function(){setTimeout((function(){t.finishWith(o)}),d.getAnimationTime())}))},toggleObjective:function(){s.getEventBaton().trigger("commandSubmitted","objective")},toggleGoal:function(){this.goalCanvasHolder&&this.goalCanvasHolder.inDom?this.hideGoal():this.showGoal()},showGoal:function(e,t){this.isGoalExpanded=!0,this.trigger("goalToggled"),this.showSideVis(e,t,this.goalCanvasHolder,this.initGoalVisualization),$(this.goalVis.el).offset().left>.5*$(window).width()&&($("#goalPlaceholder").show(),this.mainVis.myResize())},showSideVis:function(e,t,o,n){o&&o.inDom||(o=n.apply(this)),o.restore(this.goalWindowPos,this.goalWindowSize),setTimeout((function(){e&&e.finishWith(t)}),o.getAnimationTime())},hideGoal:function(e,t){this.isGoalExpanded=!1,this.trigger("goalToggled"),this.hideSideVis(e,t,this.goalCanvasHolder)},hideSideVis:function(e,t,o,n){var a=function(){e&&e.finishWith(t)};o&&o.inDom?(o.die(),setTimeout(a,o.getAnimationTime())):a()},initParseWaterfall:function(e){E.__super__.initParseWaterfall.apply(this,[e]),this.parseWaterfall.addFirst("parseWaterfall",D),this.parseWaterfall.addFirst("instantWaterfall",this.getInstantCommands()),e.level.disabledMap&&this.parseWaterfall.addFirst("instantWaterfall",new b({disabledMap:e.level.disabledMap}).getInstantCommands())},initGitShim:function(e){this.gitShim=new v({beforeCB:this.beforeCommandCB.bind(this),afterCB:this.afterCommandCB.bind(this),afterDeferHandler:this.afterCommandDefer.bind(this)})},undo:function(){this.gitCommandsIssued.pop(),E.__super__.undo.apply(this,arguments)},beforeCommandCB:function(e){this._treeBeforeCommand=this.mainVis.gitEngine.printTree()},afterCommandCB:function(e){this.doesCommandCountTowardsTotal(e)&&(this.gitCommandsIssued.push(e.get("rawStr")),this.undoStack.push(this._treeBeforeCommand))},doesCommandCountTowardsTotal:function(e){if(e.get("error"))return!1;var t=!1,o=w.commands.getCommandsThatCount();return Object.values(o).forEach((function(o){Object.values(o).forEach((function(o){t=t||o.test(e.get("rawStr"))}))})),t},afterCommandDefer:function(e,t){if(this.solved)return t.addWarning(c.str("already-solved")),void e.resolve();var o=this.mainVis.gitEngine.printTree();M.dispatchFromLevel(this.level,o)?this.levelSolved(e):e.resolve()},getNumSolutionCommands:function(){return this.level.solutionCommand.replace(/^;|;$/g,"").split(";").length},testOption:function(e){return this.options.command&&new RegExp("--"+e).test(this.options.command.get("rawStr"))},testOptionOnString:function(e,t){return e&&new RegExp("--"+t).test(e)},levelSolved:function(e){this.solved=!0,this.isShowingSolution||(p.setLevelSolved(this.level.id),m.levelSolved(this.getEnglishName())),this.hideGoal();var t=g.getNextLevel(this.level.id),o=this.gitCommandsIssued.length,a=this.getNumSolutionCommands(),i=this.testOption("noFinishDialog")||this.wasResetAfterSolved,r=this.wasResetAfterSolved;r||d.levelSolved();var c=1;switch(h.getNumLevelsSolved()){case 2:c=1.5;break;case 3:c=1.8;break;case 4:c=2.1;break;case 5:c=2.4}h.getNumLevelsSolved()>5&&(c=2.5);var l=null;if(r){var u=n.defer();u.resolve(),l=u.promise,s.getEventBaton().trigger("commandSubmitted","echo \"level solved! type in 'levels' to access the next level\"")}else d.changeIsAnimating(!0),l=this.mainVis.gitVisuals.finishAnimation(c),this.mainVis.originVis&&(l=l.then(this.mainVis.originVis.gitVisuals.finishAnimation(c)));i||(l=l.then((function(){return new A({nextLevel:t,numCommands:o,best:a}).getPromise()}))),l.then((function(){!i&&t&&(m.choseNextLevel(t.id),s.getEventBaton().trigger("commandSubmitted","level "+t.id))})).fail((function(){})).done((function(){d.changeIsAnimating(!1),e.resolve()}))},die:function(){i.unmountComponentAtNode(document.getElementById("levelToolbarMount")),this.hideGoal(),this.mainVis.die(),this.releaseControl(),this.clear(),delete this.commandCollection,delete this.mainVis,delete this.goalVis,delete this.goalCanvasHolder},getInstantCommands:function(){var e=function(){var e=c.getHint(this.level);return e&&e.length?e:c.str("no-hint")}.bind(this);return[[/^help$|^\?$/,function(){throw new l.CommandResult({msg:c.str("help-vague-level")})}],[/^hint$/,function(){throw new l.CommandResult({msg:e()})}]]},reset:function(e,t){this.gitCommandsIssued=[];var o=e?e.get("rawStr"):"";this.testOptionOnString(o,"forSolution")||(this.isShowingSolution=!1),this.solved&&(this.wasResetAfterSolved=!0),this.solved=!1,E.__super__.reset.apply(this,arguments)},buildLevel:function(e,t){this.exitLevel(),setTimeout((function(){s.getSandbox().buildLevel(e,t)}),1.5*this.getAnimationTime())},importLevel:function(e,t){this.exitLevel(),setTimeout((function(){s.getSandbox().importLevel(e,t)}),1.5*this.getAnimationTime())},startLevel:function(e,t){this.exitLevel(),setTimeout((function(){s.getSandbox().startLevel(e,t)}),1.5*this.getAnimationTime())},exitLevel:function(e,t){this.die(),e&&t&&(setTimeout((function(){e.finishWith(t)}),this.getAnimationTime()),s.getEventBaton().trigger("levelExited"))},processLevelCommand:function(e,t){var o={"show goal":this.showGoal,"hide goal":this.hideGoal,"show solution":this.showSolution,"start dialog":this.startDialog,"help level":this.startDialog,objective:this.objectiveDialog}[e.get("method")];if(!o)throw new Error("woah we don't support that method yet",o);o.apply(this,[e,t])}});o.Level=E,o.regexMap=_},{"../actions/GlobalStateActions":41,"../actions/LevelActions":42,"../app":44,"../commands":45,"../dialogs/confirmShowSolution":47,"../git/gitShim":53,"../graph/treeCompare":57,"../intl":59,"../level/disabledMap":62,"../log":65,"../react_views/LevelToolbarView.jsx":74,"../sandbox/":77,"../stores/GlobalStateStore":79,"../stores/LevelStore":80,"../util":88,"../util/errors":85,"../views":98,"../views/multiView":100,"../visuals/visualization":111,q:19,react:28,"react-dom":22}],64:[function(e,t,o){var n=e("../git/commands"),a=e("../commands"),i=e("../sandbox/commands"),r=function(e){e=e||{},this.options=e,this.shortcutWaterfall=e.shortcutWaterfall||[a.commands.getShortcutMap()],this.instantWaterfall=e.instantWaterfall||[n.instantCommands,i.instantCommands]};r.prototype.initParseWaterfall=function(){e("../util").isBrowser()?this.parseWaterfall=this.options.parseWaterfall||[a.parse,i.parse,i.getOptimisticLevelParse(),i.getOptimisticLevelBuilderParse()]:this.parseWaterfall=[a.parse]},r.prototype.clone=function(){return new r({shortcutWaterfall:this.shortcutWaterfall.slice(),instantWaterfall:this.instantWaterfall.slice(),parseWaterfall:this.parseWaterfall.slice()})},r.prototype.getWaterfallMap=function(){return this.parseWaterfall||this.initParseWaterfall(),{shortcutWaterfall:this.shortcutWaterfall,instantWaterfall:this.instantWaterfall,parseWaterfall:this.parseWaterfall}},r.prototype.addFirst=function(e,t){if(!e||!t)throw new Error("need to know which!!!");this.getWaterfallMap()[e].unshift(t)},r.prototype.addLast=function(e,t){this.getWaterfallMap()[e].push(t)},r.prototype.expandAllShortcuts=function(e){return this.shortcutWaterfall.forEach((function(t){e=this.expandShortcut(e,t)}),this),e},r.prototype.expandShortcut=function(e,t){return Object.keys(t).forEach((function(o){var n=t[o];Object.keys(n).forEach((function(t){var a=n[t].exec(e);a&&(e=o+" "+t+" "+e.slice(a[0].length))}))})),e},r.prototype.processAllInstants=function(e){this.instantWaterfall.forEach((function(t){this.processInstant(e,t)}),this)},r.prototype.processInstant=function(e,t){t.forEach((function(t){var o=t[0].exec(e);o&&t[1](o)}))},r.prototype.parseAll=function(e){this.parseWaterfall||this.initParseWaterfall();var t=!1;return this.parseWaterfall.forEach((function(o){var n=o(e);n&&(t=n)}),this),t},o.ParseWaterfall=r},{"../commands":45,"../git/commands":52,"../sandbox/commands":76,"../util":88}],65:[function(e,t,o){var n=function(e,t,o){window._gaq=window._gaq||[],window._gaq.push(["_trackEvent",e,t,o])};o.viewInteracted=function(e){n("views","interacted",e)},o.showLevelSolution=function(e){n("levels","showedLevelSolution",e)},o.choseNextLevel=function(e){n("levels","nextLevelChosen",e)},o.levelSelected=function(e){n("levels","levelSelected",e)},o.levelSolved=function(e){n("levels","levelSolved",e)},o.commandEntered=function(e){n("commands","commandEntered",e)}},{}],66:[function(e,t,o){var n=e("../intl"),a=(e("../git/commands"),e("../util/errors")),i=(a.CommandProcessError,a.GitError),r=(a.Warning,a.CommandResult,{commit:{regex:/^hg +(commit|ci)($|\s)/,options:["--amend","-A","-m"],delegate:function(e,t){return t.getOptionsMap()["-A"]&&t.addWarning(n.str("hg-a-option")),{vcs:"git",name:"commit"}}},status:{regex:/^hg +(status|st) *$/,dontCountForGolf:!0,execute:function(e,t){throw new i({msg:n.str("hg-error-no-status")})}},export:{regex:/^hg +export($|\s)/,dontCountForGolf:!0,delegate:function(e,t){return t.mapDotToHead(),{vcs:"git",name:"show"}}},graft:{regex:/^hg +graft($|\s)/,options:["-r"],delegate:function(e,t){return t.acceptNoGeneralArgs(),t.prependOptionR(),{vcs:"git",name:"cherrypick"}}},log:{regex:/^hg +log($|\s)/,options:["-f"],dontCountForGolf:!0,delegate:function(e,t){var o=t.getOptionsMap();if(t.acceptNoGeneralArgs(),!o["-f"])throw new i({msg:n.str("hg-error-log-no-follow")});return t.mapDotToHead(),{vcs:"git",name:"log"}}},bookmark:{regex:/^hg (bookmarks|bookmark|book)($|\s)/,options:["-r","-f","-d"],delegate:function(e,t){var o,a,r=t.getOptionsMap(),s=t.getGeneralArgs(),c={vcs:"git"};if(r["-m"]&&r["-d"])throw new i({msg:n.todo("-m and -d are incompatible")});if(r["-d"]&&r["-r"])throw new i({msg:n.todo("-r is incompatible with -d")});if(r["-m"]&&r["-r"])throw new i({msg:n.todo("-r is incompatible with -m")});return s.length+(r["-r"]?r["-r"].length:0)+(r["-d"]?r["-d"].length:0)===0?(c.name="branch",c):(r["-d"]?(r["-D"]=r["-d"],delete r["-d"],c.name="branch"):r["-r"]?(o=(s=t.getGeneralArgs())[0],a=r["-r"][0],c.name="branch",t.setGeneralArgs([o,a])):s.length>0?(t.setOptionsMap({"-b":[s[0]]}),c.name="checkout",t.setGeneralArgs([])):c.name="branch",c)}},rebase:{regex:/^hg +rebase($|\s+)/,options:["-d","-s","-b"],execute:function(e,t){var o=function(){throw new i({msg:n.str("git-error-options")})},a=t.getOptionsMap();if(a["-d"]&&a["-s"]||!a["-d"]&&a["-s"],a["-b"]||(a["-b"]=["."]),t.setOptionsMap(a),t.mapDotToHead(),(a=t.getOptionsMap())["-d"]){var r=a["-d"][0]||o(),s=a["-b"][0];e.hgRebase(r,s)}else o()}},update:{regex:/^hg +(update|up)($|\s+)/,options:["-r"],delegate:function(e,t){return t.appendOptionR(),{vcs:"git",name:"checkout"}}},backout:{regex:/^hg +backout($|\s+)/,options:["-r"],delegate:function(e,t){return t.prependOptionR(),{vcs:"git",name:"revert"}}},histedit:{regex:/^hg +histedit($|\s+)/,delegate:function(e,t){var o=t.getGeneralArgs();return t.validateArgBounds(o,1,1),t.setOptionsMap({"-i":o}),t.setGeneralArgs([]),{vcs:"git",name:"rebase"}}},pull:{regex:/^hg +pull($|\s+)/,delegate:function(e,t){return{vcs:"git",name:"pull"}}},summary:{regex:/^hg +(summary|sum) *$/,delegate:function(e,t){return{vcs:"git",name:"branch"}}}});o.commandConfig=r},{"../git/commands":52,"../intl":59,"../util/errors":85}],67:[function(e,t,o){var n=e("q"),a=e("backbone"),i=e("../git").Commit,r=e("../git").Branch,s=e("../git").Tag,c=e("../models/commandModel").Command,m=e("../util/constants").TIME,l=a.Collection.extend({model:i}),u=a.Collection.extend({model:c}),d=a.Collection.extend({model:r}),h=a.Collection.extend({model:s}),p=a.Model.extend({defaults:{collection:null},initialize:function(e){e.collection.bind("add",this.addCommand,this),this.buffer=[],this.timeout=null},addCommand:function(e){this.buffer.push(e),this.touchBuffer()},touchBuffer:function(){this.timeout||this.setTimeout()},setTimeout:function(){this.timeout=setTimeout(function(){this.sipFromBuffer()}.bind(this),m.betweenCommandsDelay)},popAndProcess:function(){for(var e=this.buffer.shift(0);e.get("error")&&this.buffer.length;)e=this.buffer.shift(0);e.get("error")?this.clear():this.processCommand(e)},processCommand:function(t){t.set("status","processing");var o=n.defer();o.promise.then(function(){this.setTimeout()}.bind(this));var a=t.get("eventName");if(!a)throw new Error("I need an event to trigger when this guy is parsed and ready");var i=e("../app");if(!i.getEventBaton().getNumListeners(a)){var r=e("../util/errors");return t.set("error",new r.GitError({msg:"That command is valid, but not supported in this current environment! Try entering a level or level builder to use that command"})),void o.resolve()}i.getEventBaton().trigger(a,t,o)},clear:function(){clearTimeout(this.timeout),this.timeout=null},sipFromBuffer:function(){this.buffer.length?this.popAndProcess():this.clear()}});o.CommitCollection=l,o.CommandCollection=u,o.BranchCollection=d,o.TagCollection=h,o.CommandBuffer=p},{"../app":44,"../git":55,"../models/commandModel":68,"../util/constants":82,"../util/errors":85,backbone:1,q:19}],68:[function(e,t,o){var n=e("backbone"),a=e("../util/errors"),i=e("../level/parseWaterfall").ParseWaterfall,r=e("../intl"),s=a.CommandProcessError,c=a.GitError,m=a.Warning,l=a.CommandResult,u=n.Model.extend({defaults:{status:"inqueue",rawStr:null,result:"",createTime:null,error:null,warnings:null,parseWaterfall:new i,generalArgs:null,supportedMap:null,options:null,method:null},initialize:function(){this.initDefaults(),this.validateAtInit(),this.on("change:error",this.errorChanged,this),this.get("error")&&this.errorChanged(),this.parseOrCatch()},initDefaults:function(){this.set("generalArgs",[]),this.set("supportedMap",{}),this.set("warnings",[])},replaceDotWithHead:function(e){return e.replace(/\./g,"HEAD")},appendOptionR:function(){var e=this.getOptionsMap()["-r"]||[];this.setGeneralArgs(this.getGeneralArgs().concat(e))},prependOptionR:function(){var e=this.getOptionsMap()["-r"]||[];this.setGeneralArgs(e.concat(this.getGeneralArgs()))},mapDotToHead:function(){var e=this.getGeneralArgs(),t=this.getOptionsMap();e=e.map((function(e){return this.replaceDotWithHead(e)}),this);var o={};Object.keys(t).forEach((function(e){var n=t[e];o[e]=Object.values(n).map((function(e){return this.replaceDotWithHead(e)}),this)}),this),this.setGeneralArgs(e),this.setOptionsMap(o)},deleteOptions:function(e){var t=this.getOptionsMap();e.forEach((function(e){delete t[e]}),this),this.setOptionsMap(t)},getGeneralArgs:function(){return this.get("generalArgs")},setGeneralArgs:function(e){this.set("generalArgs",e)},setOptionsMap:function(e){this.set("supportedMap",e)},getOptionsMap:function(){return this.get("supportedMap")},acceptNoGeneralArgs:function(){if(this.getGeneralArgs().length)throw new c({msg:r.str("git-error-no-general-args")})},oneArgImpliedHead:function(e,t){this.validateArgBounds(e,0,1,t),this.impliedHead(e,0)},twoArgsImpliedHead:function(e,t){this.validateArgBounds(e,1,2,t),this.impliedHead(e,1)},oneArgImpliedOrigin:function(e){this.validateArgBounds(e,0,1),e.length||e.unshift("origin")},twoArgsForOrigin:function(e){this.validateArgBounds(e,0,2)},impliedHead:function(e,t){e.length==t&&e.push("HEAD")},validateArgBounds:function(e,t,o,n){var a=void 0===n?"git "+this.get("method"):this.get("method")+" "+n+" ";if(a="with "+a,e.length<t)throw new c({msg:r.str("git-error-args-few",{lower:String(t),what:a})});if(e.length>o)throw new c({msg:r.str("git-error-args-many",{upper:String(o),what:a})})},validateAtInit:function(){if(null===this.get("rawStr"))throw new Error("Give me a string!");this.get("createTime")||this.set("createTime",(new Date).toString())},setResult:function(e){this.set("result",e)},finishWith:function(e){this.set("status","finished"),e.resolve()},addWarning:function(e){this.get("warnings").push(e),this.set("numWarnings",this.get("numWarnings")?this.get("numWarnings")+1:1)},parseOrCatch:function(){this.expandShortcuts(this.get("rawStr"));try{this.processInstants()}catch(e){return a.filterError(e),void this.set("error",e)}this.parseAll()||this.set("error",new s({msg:'The command "'+this.get("rawStr")+"\" isn't supported, sorry!"}))},errorChanged:function(){var e=this.get("error");e&&(e instanceof s||e instanceof c?this.set("status","error"):e instanceof l?this.set("status","finished"):e instanceof m&&this.set("status","warning"),this.formatError())},formatError:function(){this.set("result",this.get("error").getMsg())},expandShortcuts:function(e){e=this.get("parseWaterfall").expandAllShortcuts(e),this.set("rawStr",e)},processInstants:function(){var e=this.get("rawStr");if(!e.length)throw new l({msg:""});this.get("parseWaterfall").processAllInstants(e)},parseAll:function(){var e=this.get("rawStr"),t=this.get("parseWaterfall").parseAll(e);return!!t&&(Object.keys(t.toSet).forEach((function(e){var o=t.toSet[e];this.set(e,o)}),this),!0)}});o.Command=u},{"../intl":59,"../level/parseWaterfall":64,"../util/errors":85,backbone:1}],69:[function(e,t,o){var n=e("react"),a=e("prop-types"),i=e("../react_views/CommandView.jsx"),r=e("../app"),s=["add","reset","change","all"];class c extends n.Component{componentDidMount(){for(var e=0;e<s.length;e++)this.props.commandCollection.on(s[e],this.updateFromCollection,this);this.props.commandCollection.on("change",this.scrollDown,this),r.getEvents().on("commandScrollDown",this.scrollDown,this),r.getEvents().on("clearOldCommands",()=>this.clearOldCommands(),this)}componentWillUnmount(){for(var e=0;e<s.length;e++)this.props.commandCollection.off(s[e],this.updateFromCollection,this)}updateFromCollection(){this.forceUpdate()}render(){var e=[];return this.props.commandCollection.each((function(t,o){e.push(n.createElement(i,{id:"command_"+o,command:t,key:t.cid}))}),this),n.createElement("div",null,e)}scrollDown(){var e=document.getElementById("commandDisplay"),t=document.getElementById("terminal"),o=e.clientHeight>t.clientHeight||window.innerHeight<e.clientHeight,n=t.className.match(/scrolling/g);o&&!n?t.className+=" scrolling":!o&&n&&(t.className=t.className.replace(/shouldScroll/g,"")),o&&(t.scrollTop=t.scrollHeight)}clearOldCommands(){var e=[];this.props.commandCollection.each((function(t){"inqueue"!==t.get("status")&&"processing"!==t.get("status")&&e.push(t)}),this);for(var t=0;t<e.length;t++)e[t].destroy();this.updateFromCollection(),this.scrollDown()}}c.propTypes={commandCollection:a.object.isRequired},t.exports=c},{"../app":44,"../react_views/CommandView.jsx":70,"prop-types":17,react:28}],70:[function(e,t,o){var n=e("react"),a=(e("react-dom"),e("prop-types")),i=e("../util/reactUtil"),r=e("../util/keyMirror")({inqueue:null,processing:null,finished:null});class s extends n.Component{componentDidMount(){this.props.command.on("change",this.updateStateFromModel,this),this.updateStateFromModel()}componentWillUnmount(){this.props.command.off("change",this.updateStateFromModel,this)}updateStateFromModel(){var e=this.props.command.toJSON();this.setState({status:e.status,rawStr:e.rawStr,warnings:e.warnings,result:e.result})}constructor(e,t){super(e,t),this.state={status:r.inqueue,rawStr:"git commit",warnings:[],result:""}}render(){var e=i.joinClasses([this.state.status,"commandLine","transitionBackground"]);return n.createElement("div",{id:this.props.id,className:"reactCommandView"},n.createElement("p",{className:e},n.createElement("span",{className:"prompt"},"$")," ",n.createElement("span",{dangerouslySetInnerHTML:{__html:this.state.rawStr}}),n.createElement("span",{className:"icons transitionAllSlow"},n.createElement("i",{className:"icon-exclamation-sign"}),n.createElement("i",{className:"icon-check-empty"}),n.createElement("i",{className:"icon-retweet"}),n.createElement("i",{className:"icon-check"}))),this.renderResult(),n.createElement("div",{className:"commandLineWarnings"},this.renderFormattedWarnings()))}renderResult(){if(!this.state.result)return null;for(var e=this.state.result.split("\n"),t=[],o=0;o<e.length;o++)e[o].startsWith("https://")?t.push(n.createElement("a",{href:e[o],key:"paragraph_"+o,dangerouslySetInnerHTML:{__html:e[o]}})):t.push(n.createElement("p",{key:"paragraph_"+o,dangerouslySetInnerHTML:{__html:e[o]}}));return n.createElement("div",{className:"commandLineResult"},t)}renderFormattedWarnings(){for(var e=this.state.warnings,t=[],o=0;o<e.length;o++)t.push(n.createElement("p",{key:"warning_"+o},n.createElement("i",{className:"icon-exclamation-sign"}),e[o]));return t}}s.propTypes={command:a.object.isRequired,id:a.string},t.exports=s},{"../util/keyMirror":89,"../util/reactUtil":92,"prop-types":17,react:28,"react-dom":22}],71:[function(e,t,o){var n=e("react"),a=e("prop-types"),i=e("../react_views/HelperBarView.jsx"),r=e("../app"),s=e("../log");class c extends n.Component{render(){return n.createElement(i,{items:this.getItems(),shown:this.props.shown})}fireCommand(e){s.viewInteracted("commandHelperBar"),r.getEventBaton().trigger("commandSubmitted",e)}getItems(){return[{text:"Levels",onClick:function(){this.fireCommand("levels")}.bind(this)},{text:"Solution",onClick:function(){this.fireCommand("show solution")}.bind(this)},{text:"Reset",onClick:function(){this.fireCommand("reset")}.bind(this)},{text:"Undo",onClick:function(){this.fireCommand("undo")}.bind(this)},{text:"Objective",onClick:function(){this.fireCommand("objective")}.bind(this)},{text:"Help",onClick:function(){this.fireCommand("help general; git help")}.bind(this)},{icon:"signout",onClick:function(){this.props.onExit()}.bind(this)}]}}c.propTypes={shown:a.bool.isRequired,onExit:a.func.isRequired},t.exports=c},{"../app":44,"../log":65,"../react_views/HelperBarView.jsx":72,"prop-types":17,react:28}],72:[function(e,t,o){var n=e("react"),a=e("prop-types"),i=e("../util/reactUtil");class r extends n.Component{render(){var e=i.joinClasses(["helperBar","transitionAll",this.props.shown?"show":"",this.props.className?this.props.className:""]);return n.createElement("div",{className:e},this.props.items.map(function(e,t){return[this.renderItem(e,t),t===this.props.items.length-1?null:n.createElement("span",{key:"helper_bar_span_"+t}," ")]}.bind(this)))}renderItem(e,t){var o=e.icon||e.testID||e.text.toLowerCase();return e.newPageLink?n.createElement("a",{"data-testid":o,key:"helper_bar_"+t,onClick:e.onClick,target:"_blank",href:e.href},n.createElement("i",{className:"icon-"+e.icon})," "):n.createElement("a",{"data-testid":o,key:"helper_bar_"+t,onClick:e.onClick},e.text?e.text:n.createElement("i",{className:"icon-"+e.icon})," ")}}r.propTypes={className:a.string,shown:a.bool.isRequired,items:a.array.isRequired},t.exports=r},{"../util/reactUtil":92,"prop-types":17,react:28}],73:[function(e,t,o){var n=e("prop-types"),a=e("../react_views/HelperBarView.jsx"),i=e("../app"),r=e("react"),s=e("../log");class c extends r.Component{render(){return r.createElement(a,{items:this.getItems(),shown:this.props.shown})}fireCommand(e){s.viewInteracted("intlSelect"),i.getEventBaton().trigger("commandSubmitted",e),this.props.onExit()}getItems(){return[{text:"Git Branching",testID:"english",onClick:function(){this.fireCommand("locale en_US; levels")}.bind(this)},{text:"日本語版リポジトリ",testID:"japanese",onClick:function(){this.fireCommand("locale ja; levels")}.bind(this)},{text:"Git 브랜치 배우기",testID:"korean",onClick:function(){this.fireCommand("locale ko; levels")}.bind(this)},{text:"学习 Git 分支",testID:"simplifiedChinese",onClick:function(){this.fireCommand("locale zh_CN; levels")}.bind(this)},{text:"學習 Git 分支",testID:"traditionalChinese",onClick:function(){this.fireCommand("locale zh_TW; levels")}.bind(this)},{text:"español",testID:"spanish",onClick:function(){this.fireCommand("locale es_ES; levels")}.bind(this)},{text:"argentino",testID:"argentinian",onClick:function(){this.fireCommand("locale es_AR; levels")}.bind(this)},{text:"português",testID:"portuguese",onClick:function(){this.fireCommand("locale pt_BR; levels")}.bind(this)},{text:"français",testID:"french",onClick:function(){this.fireCommand("locale fr_FR; levels")}.bind(this)},{text:"Deutsch",testID:"german",onClick:function(){this.fireCommand("locale de_DE; levels")}.bind(this)},{text:"Русский",testID:"russian",onClick:function(){this.fireCommand("locale ru_RU; levels")}.bind(this)},{text:"Українська",testID:"ukrainian",onClick:function(){this.fireCommand("locale uk; levels")}.bind(this)},{text:"Tiếng Việt",testID:"vietnamese",onClick:function(){this.fireCommand("locale vi; levels")}.bind(this)},{text:"Galego",testID:"galician",onClick:function(){this.fireCommand("locale gl; levels")}.bind(this)},{icon:"signout",onClick:function(){this.props.onExit()}.bind(this)}]}}c.propTypes={shown:n.bool.isRequired,onExit:n.func.isRequired},t.exports=c},{"../app":44,"../log":65,"../react_views/HelperBarView.jsx":72,"prop-types":17,react:28}],74:[function(e,t,o){var n=e("react"),a=e("prop-types"),i=e("../intl"),r=e("../util/reactUtil");class s extends n.Component{constructor(e,t){super(e,t),this.state={isHidden:!0,isGoalExpanded:this.props.parent.getIsGoalExpanded()}}componentWillUnmount(){this._isMounted=!1}componentDidMount(){this._isMounted=!0,this.setState({isHidden:this.props.parent.getIsGoalExpanded(),isGoalExpanded:this.props.parent.getIsGoalExpanded()}),this.props.parent.on("goalToggled",function(){this._isMounted&&this.setState({isGoalExpanded:this.props.parent.getIsGoalExpanded()})}.bind(this))}render(){return n.createElement("div",{className:r.joinClasses(["toolbar","level-toolbar","box","vertical","center","transitionAll",this.state.isHidden?"hidden":""])},n.createElement("div",{className:"clearfix"},n.createElement("div",{className:"levelNameWrapper"},n.createElement("i",{className:"icon-bolt"})," Level ",n.createElement("span",{className:"levelToolbarSpan"},this.props.name))),n.createElement("div",{className:"buttonsWrapper"},n.createElement("div",{className:"showGoalWrapper"},n.createElement("button",{onClick:this.props.onGoalClick,type:"button"},this.state.isGoalExpanded?i.str("hide-goal-button"):i.str("show-goal-button"))),n.createElement("div",{className:"showObjectiveWrapper"},n.createElement("button",{onClick:this.props.onObjectiveClick,type:"button"},i.str("objective-button")))))}}s.propTypes={name:a.string.isRequired,onGoalClick:a.func.isRequired,onObjectiveClick:a.func.isRequired,parent:a.object.isRequired},t.exports=s},{"../intl":59,"../util/reactUtil":92,"prop-types":17,react:28}],75:[function(e,t,o){var n=e("../react_views/HelperBarView.jsx"),a=e("../react_views/IntlHelperBarView.jsx"),i=e("../react_views/CommandsHelperBarView.jsx"),r=e("react"),s=e("../util/keyMirror"),c=(e("../log"),s({SELF:null,INTL:null,COMMANDS:null}));class m extends r.Component{constructor(e,t){super(e,t),this.state={shownBar:c.SELF}}render(){return r.createElement("div",null,r.createElement(n,{className:"BaseHelperBar",items:this.getItems(),shown:this.state.shownBar===c.SELF}),r.createElement(i,{shown:this.state.shownBar===c.COMMANDS,onExit:this.showSelf.bind(this)}),r.createElement(a,{shown:this.state.shownBar===c.INTL,onExit:this.showSelf.bind(this)}))}showSelf(){this.setState({shownBar:c.SELF})}getItems(){return[{icon:"question-sign",onClick:function(){this.setState({shownBar:c.COMMANDS})}.bind(this)},{icon:"globe",onClick:function(){this.setState({shownBar:c.INTL})}.bind(this)},{newPageLink:!0,icon:"twitter",href:"https://twitter.com/petermcottle"},{newPageLink:!0,icon:"facebook",href:"https://www.facebook.com/LearnGitBranching"}]}}t.exports=m},{"../log":65,"../react_views/CommandsHelperBarView.jsx":71,"../react_views/HelperBarView.jsx":72,"../react_views/IntlHelperBarView.jsx":73,"../util/keyMirror":89,react:28}],76:[function(e,t,o){var n=e("../util"),a=(e("../util/constants"),e("../intl")),i=e("../commands"),r=e("../util/errors"),s=(r.CommandProcessError,e("../stores/LocaleStore")),c=e("../actions/LocaleActions"),m=e("../stores/GlobalStateStore"),l=e("../actions/GlobalStateActions"),u=(r.GitError,r.Warning,r.CommandResult),d=[[/^ls( |$)/,function(){throw new u({msg:a.str("ls-command")})}],[/^cd( |$)/,function(){throw new u({msg:a.str("cd-command")})}],[/^(locale|locale reset)$/,function(e){throw c.changeLocale(s.getDefaultLocale()),new u({msg:a.str("locale-reset-command",{locale:s.getDefaultLocale()})})}],[/^show$/,function(e){var t=[a.str("show-command"),"<br/>","show commands","show solution","show goal"];throw new u({msg:t.join("\n")})}],[/^locale (\w+)$/,function(e){throw c.changeLocale(e[1]),new u({msg:a.str("locale-command",{locale:e[1]})})}],[/^flip$/,function(){throw l.changeFlipTreeY(!m.getFlipTreeY()),e("../app").getEvents().trigger("refreshTree"),new u({msg:a.str("flip-tree-command")})}],[/^refresh$/,function(){throw e("../app").getEvents().trigger("refreshTree"),new u({msg:a.str("refresh-tree-command")})}],[/^rollup (\d+)$/,function(t){throw e("../app").getEvents().trigger("rollupCommands",t[1]),new u({msg:"Commands combined!"})}],[/^echo "(.*?)"$|^echo (.*?)$/,function(e){var t=e[1]||e[2];throw new u({msg:t})}],[/^show +commands$/,function(e){var t=p(),o=[a.str("show-all-commands"),"<br/>"];throw Object.keys(t).forEach((function(e){o.push(e)})),new u({msg:o.join("\n")})}]],h={"reset solved":/^reset solved($|\s)/,help:/^help( +general)?$|^\?$/,reset:/^reset( +--forSolution)?$/,delay:/^delay (\d+)$/,clear:/^clear($|\s)/,"exit level":/^exit level($|\s)/,sandbox:/^sandbox($|\s)/,level:/^level\s?([a-zA-Z0-9]*)/,levels:/^levels($|\s)/,mobileAlert:/^mobile alert($|\s)/,"build level":/^build +level\s?([a-zA-Z0-9]*)$/,"export tree":/^export +tree$/,importTreeNow:/^importTreeNow($|\s)/,importLevelNow:/^importLevelNow($|\s)/,"import tree":/^import +tree$/,"import level":/^import +level$/,undo:/^undo($|\s)/,"share permalink":/^share( +permalink)?$/},p=function(){var t=Object.assign({},e("../level").regexMap,h),o=i.commands.getRegexMap();return Object.keys(o).forEach((function(e){var n=o[e];Object.keys(n).forEach((function(o){var a=n[o];t[e+" "+o]=a}))})),["mobileAlert"].forEach((function(e){delete t[e]})),t};o.instantCommands=d,o.parse=n.genParseCommand(h,"processSandboxCommand"),o.getOptimisticLevelParse=function(){return n.genParseCommand(e("../level").regexMap,"processLevelCommand")},o.getOptimisticLevelBuilderParse=function(){return n.genParseCommand(e("../level/builder").regexMap,"processLevelBuilderCommand")}},{"../actions/GlobalStateActions":41,"../actions/LocaleActions":43,"../app":44,"../commands":45,"../intl":59,"../level":63,"../level/builder":61,"../stores/GlobalStateStore":79,"../stores/LocaleStore":81,"../util":88,"../util/constants":82,"../util/errors":85}],77:[function(e,t,o){var n=e("q"),a=e("backbone"),i=e("../util"),r=e("../intl"),s=e("../app"),c=e("../util/errors"),m=e("../visuals/visualization").Visualization,l=e("../level/parseWaterfall").ParseWaterfall,u=(e("../level/disabledMap").DisabledMap,e("../models/commandModel").Command),d=e("../git/gitShim").GitShim,h=e("../actions/LevelActions"),p=e("../stores/LevelStore"),g=e("../views"),f=(g.ModalTerminal,g.ModalAlert,e("../views/builderViews")),b=e("../views/multiView").MultiView,v=a.View.extend({tagName:"div",initialize:function(e){e=e||{},this.options=e,this.initVisualization(e),this.initCommandCollection(e),this.initParseWaterfall(e),this.initGitShim(e),this.initUndoStack(e),e.wait||this.takeControl()},getDefaultVisEl:function(){return $("#mainVisSpace")[0]},getAnimationTime:function(){return 1050},initVisualization:function(e){this.mainVis=new m({el:e.el||this.getDefaultVisEl()})},initUndoStack:function(e){this.undoStack=[]},initCommandCollection:function(e){this.commandCollection=s.getCommandUI().commandCollection},initParseWaterfall:function(e){this.parseWaterfall=new l},initGitShim:function(e){this.gitShim=new d({beforeCB:this.beforeCommandCB.bind(this)})},takeControl:function(){s.getEventBaton().stealBaton("commandSubmitted",this.commandSubmitted,this),s.getEventBaton().stealBaton("processSandboxCommand",this.processSandboxCommand,this),s.getEventBaton().stealBaton("levelExited",this.levelExited,this),this.insertGitShim()},releaseControl:function(){s.getEventBaton().releaseBaton("commandSubmitted",this.commandSubmitted,this),s.getEventBaton().releaseBaton("processSandboxCommand",this.processSandboxCommand,this),s.getEventBaton().releaseBaton("levelExited",this.levelExited,this),this.releaseGitShim()},releaseGitShim:function(){this.gitShim&&this.gitShim.removeShim()},insertGitShim:function(){this.gitShim&&this.mainVis.customEvents.on("gitEngineReady",(function(){this.gitShim.insertShim()}),this)},beforeCommandCB:function(e){this.pushUndo()},pushUndo:function(){this.undoStack.push(this.mainVis.gitEngine.printTree())},undo:function(e,t){var o=this.undoStack.pop();if(!o)return e.set("error",new c.GitError({msg:r.str("undo-stack-empty")})),void t.resolve();this.mainVis.reset(o),setTimeout((function(){e.finishWith(t)}),this.mainVis.getAnimationTime())},commandSubmitted:function(e){s.getEvents().trigger("commandSubmittedPassive",e),i.splitTextCommand(e,(function(e){this.commandCollection.add(new u({rawStr:e,parseWaterfall:this.parseWaterfall}))}),this)},startLevel:function(t,o){var a=(t.get("regexResults")||[])[1]||"",i=p.getLevel(a);if(!i)return t.addWarning(r.str("level-no-id",{id:a})),s.getEventBaton().trigger("commandSubmitted","levels"),t.set("status","error"),void o.resolve();this.hide(),this.clear();var c=n.defer(),m=e("../level").Level;this.currentLevel=new m({level:i,deferred:c,command:t}),c.promise.then((function(){t.finishWith(o)}))},buildLevel:function(t,o){this.hide(),this.clear();var a=n.defer(),i=e("../level/builder").LevelBuilder,r=(t.get("regexResults")||[])[1]||!1;this.levelBuilder=new i({deferred:a,editLevel:r}),a.promise.then((function(){t.finishWith(o)}))},exitLevel:function(e,t){e.addWarning(r.str("level-cant-exit")),e.set("status","error"),t.resolve()},showLevels:function(e,t){var o=n.defer();s.getLevelDropdown().show(o,e),o.promise.done((function(){e.finishWith(t)}))},sharePermalink:function(e,t){var o=JSON.stringify(this.mainVis.gitEngine.exportTree()),n="https://learngitbranching.js.org/?NODEMO&command=importTreeNow%20"+escape(o);e.setResult(r.todo("Here is a link to the current state of the tree: ")+"\n"+n),e.finishWith(t)},resetSolved:function(e,t){h.resetLevelsSolved(),e.addWarning(r.str("solved-map-reset")),e.finishWith(t)},processSandboxCommand:function(e,t){var o={"reset solved":this.resetSolved,undo:this.undo,"help general":this.helpDialog,help:this.helpDialog,reset:this.reset,delay:this.delay,clear:this.clear,"exit level":this.exitLevel,level:this.startLevel,sandbox:this.exitLevel,levels:this.showLevels,mobileAlert:this.mobileAlert,"build level":this.buildLevel,"export tree":this.exportTree,"import tree":this.importTree,importTreeNow:this.importTreeNow,"import level":this.importLevel,importLevelNow:this.importLevelNow,"share permalink":this.sharePermalink}[e.get("method")];if(!o)throw new Error("no method for that wut");o.apply(this,[e,t])},hide:function(){this.mainVis.hide()},levelExited:function(){this.show()},show:function(){this.mainVis.show()},importLevelNow:function(t,o){var a=t.get("regexResults")||[];if(a.length<2)return t.set("error",new c.GitError({msg:r.str("git-error-options")})),void t.finishWith(o);var i=a.input.replace(/importLevelNow\s+/g,""),s=e("../level").Level;try{var m=JSON.parse(unescape(i)),l=n.defer();this.currentLevel=new s({level:m,deferred:l,command:t}),this.hide(),l.promise.then((function(){t.finishWith(o)}))}catch(e){throw t.set("error",new c.GitError({msg:"Something went wrong "+String(e)})),e}t.finishWith(o)},importTreeNow:function(e,t){var o=e.get("regexResults")||[];o.length<2&&(e.set("error",new c.GitError({msg:r.str("git-error-options")})),e.finishWith(t));var n=o.input.replace(/importTreeNow\s+/g,"");try{this.mainVis.gitEngine.loadTreeFromString(n)}catch(t){e.set("error",new c.GitError({msg:String(t)}))}e.finishWith(t)},importTree:function(e,t){new f.MarkdownPresenter({previewText:r.str("paste-json"),fillerText:" "}).deferred.promise.then(function(e){try{this.mainVis.gitEngine.loadTree(JSON.parse(e))}catch(e){this.mainVis.reset(),new b({childViews:[{type:"ModalAlert",options:{markdowns:["## Error!","","Something is wrong with that JSON! Here is the error:","",String(e)]}}]})}}.bind(this)).fail((function(){})).done((function(){e.finishWith(t)}))},importLevel:function(t,o){new f.MarkdownPresenter({previewText:r.str("paste-json"),fillerText:" "}).deferred.promise.then(function(a){var i=e("../level").Level;try{var r=JSON.parse(a),s=n.defer();this.currentLevel=new i({level:r,deferred:s,command:t}),this.hide(),s.promise.then((function(){t.finishWith(o)}))}catch(e){new b({childViews:[{type:"ModalAlert",options:{markdowns:["## Error!","","Something is wrong with that level JSON, this happened:","",String(e)]}}]}),t.finishWith(o)}}.bind(this)).fail((function(){t.finishWith(o)})).done()},exportTree:function(e,t){var o=JSON.stringify(this.mainVis.gitEngine.exportTree(),null,2);new b({childViews:[{type:"MarkdownPresenter",options:{previewText:r.str("share-tree"),fillerText:o,noConfirmCancel:!0}}]}).getPromise().then((function(){e.finishWith(t)})).done()},clear:function(e,t){s.getEvents().trigger("clearOldCommands"),e&&t&&e.finishWith(t)},mobileAlert:function(e,t){alert(r.str("mobile-alert")),e.finishWith(t)},delay:function(e,t){var o=parseInt(e.get("regexResults")[1],10);setTimeout((function(){e.finishWith(t)}),o)},reset:function(e,t){this.mainVis.reset(),this.initUndoStack(),setTimeout((function(){e.finishWith(t)}),this.mainVis.getAnimationTime())},helpDialog:function(t,o){new b({childViews:r.getDialog(e("../dialogs/sandbox"))}).getPromise().then(function(){t.finishWith(o)}.bind(this)).done()}});o.Sandbox=v},{"../actions/LevelActions":42,"../app":44,"../dialogs/sandbox":50,"../git/gitShim":53,"../intl":59,"../level":63,"../level/builder":61,"../level/disabledMap":62,"../level/parseWaterfall":64,"../models/commandModel":68,"../stores/LevelStore":80,"../util":88,"../util/errors":85,"../views":98,"../views/builderViews":95,"../views/multiView":100,"../visuals/visualization":111,backbone:1,q:19}],78:[function(e,t,o){"use strict";var n=e("../constants/AppConstants"),a=e("../dispatcher/AppDispatcher"),i=e("events").EventEmitter,r=n.ActionTypes,s=[];try{s=JSON.parse(localStorage.getItem("lgb_CommandHistory")||"[]")||[]}catch(e){}var c=Object.assign({},i.prototype,n.StoreSubscribePrototype,{getMaxHistoryLength:function(){return 100},getCommandHistoryLength:function(){return s.length},getCommandHistory:function(){return s.slice(0)},dispatchToken:a.register((function(e){var t=e.action,o=!1;switch(t.type){case r.SUBMIT_COMMAND:s.unshift(String(t.text)),s.length>100&&(s=s.slice(0,10)),function(){try{localStorage.setItem("lgb_CommandHistory",JSON.stringify(s))}catch(e){}}(),o=!0;break;case r.CHANGE_FLIP_TREE_Y:}o&&c.emit(n.CHANGE_EVENT)}))});t.exports=c},{"../constants/AppConstants":46,"../dispatcher/AppDispatcher":51,events:4}],79:[function(e,t,o){"use strict";var n=e("../constants/AppConstants"),a=e("../dispatcher/AppDispatcher"),i=e("events").EventEmitter,r=n.ActionTypes,s=!1,c=!1,m=0,l=Object.assign({},i.prototype,n.StoreSubscribePrototype,{getIsAnimating:function(){return s},getFlipTreeY:function(){return c},getNumLevelsSolved:function(){return m},dispatchToken:a.register((function(e){var t=e.action,o=!1;switch(t.type){case r.CHANGE_IS_ANIMATING:s=t.isAnimating,o=!0;break;case r.CHANGE_FLIP_TREE_Y:c=t.flipTreeY,o=!0;break;case r.LEVEL_SOLVED:m++,o=!0}o&&l.emit(n.CHANGE_EVENT)}))});t.exports=l},{"../constants/AppConstants":46,"../dispatcher/AppDispatcher":51,events:4}],80:[function(e,t,o){"use strict";var n=e("../constants/AppConstants"),a=e("../dispatcher/AppDispatcher"),i=e("events").EventEmitter,r=e("../../levels").levelSequences,s=e("../../levels").sequenceInfo,c=e("../util"),m=n.ActionTypes,l={},u={},d=[];if(c.isBrowser())p=window.localStorage;else var h={},p={setItem:function(e,t){h[e]=t||""},getItem:function(e){return e in h?h[e]:null},removeItem:function(e){delete h[e]},get length(){return Object.keys(h).length},key:function(e){return Object.keys(h)[e]||null}};try{u=JSON.parse(p.getItem("solvedMap")||"{}")||{}}catch(e){console.warn("local storage failed",e)}function g(){try{p.setItem("solvedMap",JSON.stringify(u))}catch(e){console.warn("local storage failed on set",e)}}Object.keys(r).forEach((function(e){var t=r[e];if(d.push(e),!t||!t.length)throw new Error("no empty sequences allowed");t.forEach((function(t,o){!function(e){e=e||{};["name","goalTreeString","solutionCommand"].forEach((function(t){if(void 0===e[t])throw console.log(e),new Error("I need this field for a level: "+t)}))}(t);var n=e+String(o+1),a=Object.assign({},t,{index:o,id:n,sequenceName:e});l[n]=a,r[e][o]=a}))}));var f=Object.assign({},i.prototype,n.StoreSubscribePrototype,{getSequenceToLevels:function(){return r},getSequences:function(){return Object.keys(r)},getLevelsInSequence:function(e){if(!r[e])throw new Error("that sequecne name "+e+"does not exist");return r[e]},getSequenceInfo:function(e){return s[e]},getLevel:function(e){return l[e]},getNextLevel:function(e){if(!l[e])return console.warn("that level doesn't exist!!!"),null;var t=l[e],o=t.sequenceName,n=r[o],a=t.index+1;if(a<n.length)return n[a];var i=d.indexOf(o)+1;if(i<d.length){var s=d[i];return r[s][0]}return null},isLevelSolved:function(e){if(!l[e])throw new Error("that level doesn't exist!");return!!u[e]},dispatchToken:a.register((function(e){var t=e.action,o=!1;switch(t.type){case m.RESET_LEVELS_SOLVED:u={},g(),o=!0;break;case m.SET_LEVEL_SOLVED:u[t.levelID]=!0,g(),o=!0}o&&f.emit(n.CHANGE_EVENT)}))});t.exports=f},{"../../levels":113,"../constants/AppConstants":46,"../dispatcher/AppDispatcher":51,"../util":88,events:4}],81:[function(e,t,o){"use strict";var n=e("../constants/AppConstants"),a=e("../dispatcher/AppDispatcher"),i=e("../util"),r=e("events").EventEmitter,s=n.ActionTypes,c={en:"en_US",zh:"zh_CN",ja:"ja",ko:"ko",es:"es_AR",fr:"fr_FR",de:"de_DE",pt:"pt_BR",ru:"ru_RU",uk:"uk",vi:"vi"},m={"zh-CN":"zh_CN","zh-TW":"zh_TW","pt-BR":"pt_BR","es-ES":"es_ES"},l=Object.values(c).concat(Object.values(m)).filter((function(e,t,o){return o.indexOf(e)===t}));var u="en_US",d=Object.assign({},r.prototype,n.StoreSubscribePrototype,{getDefaultLocale:function(){return"en_US"},getLangLocaleMap:function(){return Object.assign({},c)},getHeaderLocaleMap:function(){return Object.assign({},m)},getLocale:function(){return u},getSupportedLocales:function(){return l.slice()},dispatchToken:a.register((function(e){var t=e.action,o=!1,a=u;switch(t.type){case s.CHANGE_LOCALE:u=t.locale,o=!0;break;case s.CHANGE_LOCALE_FROM_HEADER:var r=function(e){for(var t,o=e.split(","),n=0;n<o.length;n++){var a=o[n].split(";")[0];if(m[a]){t=m[a];break}var i=a.slice(0,2);if(c[i]){t=c[i];break}}return t}(t.header);r&&(u=r,o=!0)}if(i.isBrowser()&&a!==u){var l=new URL(document.location.href);l.searchParams.set("locale",u),window.history.replaceState({},"",l.href)}o&&d.emit(n.CHANGE_EVENT)}))});t.exports=d},{"../constants/AppConstants":46,"../dispatcher/AppDispatcher":51,"../util":88,events:4}],82:[function(e,t,o){o.TIME={betweenCommandsDelay:400},o.GRAPHICS={arrowHeadSize:8,nodeRadius:17,curveControlPointOffset:50,defaultEasing:"easeInOut",defaultAnimationTime:400,rectFill:"hsb(0.8816909813322127,0.6,1)",headRectFill:"#2831FF",rectStroke:"#FFF",rectStrokeWidth:"3",originDash:"- ",multiBranchY:20,multiTagY:15,upstreamHeadOpacity:.5,upstreamNoneOpacity:.2,edgeUpstreamHeadOpacity:.4,edgeUpstreamNoneOpacity:.15,visBranchStrokeWidth:2,visBranchStrokeColorNone:"#333",defaultNodeFill:"hsba(0.5,0.6,0.7,1)",defaultNodeStrokeWidth:2,defaultNodeStroke:"#FFF",tagFill:"hsb(0,0,0.9)",tagStroke:"#FFF",tagStrokeWidth:"2",orphanNodeFill:"hsb(0.5,0.8,0.7)"},o.VIEWPORT={minZoom:.55,maxZoom:1.25,minWidth:600,minHeight:600}},{}],83:[function(e,t,o){t.exports=function(e,t,o){var n;return function(){var a=function(){n=null,o||e.apply(this,arguments)},i=o&&!n;clearTimeout(n),n=setTimeout(a,t),i&&e.apply(this,arguments)}}},{}],84:[function(e,t,o){var n={App:e("../app/index.js"),Tree:e("../visuals/tree"),Visuals:e("../visuals"),Git:e("../git"),CommandModel:e("../models/commandModel"),CommandLineStore:e("../stores/CommandLineStore"),CommandLineActions:e("../actions/CommandLineActions"),LevelActions:e("../actions/LevelActions"),LevelStore:e("../stores/LevelStore"),LocaleActions:e("../actions/LocaleActions"),GlobalStateActions:e("../actions/GlobalStateActions"),GlobalStateStore:e("../stores/GlobalStateStore"),LocaleStore:e("../stores/LocaleStore"),Levels:e("../graph/treeCompare"),Constants:e("../util/constants"),Commands:e("../commands"),Collections:e("../models/collections"),Async:e("../visuals/animation"),AnimationFactory:e("../visuals/animation/animationFactory"),Main:e("../app"),HeadLess:e("../git/headless"),Q:{Q:e("q")},RebaseView:e("../views/rebaseView"),Views:e("../views"),MultiView:e("../views/multiView"),ZoomLevel:e("../util/zoomLevel"),VisBranch:e("../visuals/visBranch"),TreeCompare:e("../graph/treeCompare"),Level:e("../level"),Sandbox:e("../sandbox/"),GitDemonstrationView:e("../views/gitDemonstrationView"),Markdown:e("markdown"),LevelDropdownView:e("../views/levelDropdownView"),BuilderViews:e("../views/builderViews"),Util:e("../util/index"),Intl:e("../intl")};Object.keys(n).forEach((function(e){var t=n[e];for(var o in t){var a=t[o];a instanceof Function&&(a=a.bind(t)),window["debug_"+e+"_"+o]=a}})),$(document).ready((function(){window.debug_events=n.Main.getEvents(),window.debug_eventBaton=n.Main.getEventBaton(),window.debug_sandbox=n.Main.getSandbox(),window.debug_modules=n,window.debug_levelDropdown=n.Main.getLevelDropdown(),window.debug_copyTree=function(){return n.Main.getSandbox().mainVis.gitEngine.printAndCopyTree()}}))},{"../actions/CommandLineActions":40,"../actions/GlobalStateActions":41,"../actions/LevelActions":42,"../actions/LocaleActions":43,"../app":44,"../app/index.js":44,"../commands":45,"../git":55,"../git/headless":54,"../graph/treeCompare":57,"../intl":59,"../level":63,"../models/collections":67,"../models/commandModel":68,"../sandbox/":77,"../stores/CommandLineStore":78,"../stores/GlobalStateStore":79,"../stores/LevelStore":80,"../stores/LocaleStore":81,"../util/constants":82,"../util/index":88,"../util/zoomLevel":94,"../views":98,"../views/builderViews":95,"../views/gitDemonstrationView":97,"../views/levelDropdownView":99,"../views/multiView":100,"../views/rebaseView":101,"../visuals":104,"../visuals/animation":103,"../visuals/animation/animationFactory":102,"../visuals/tree":105,"../visuals/visBranch":107,markdown:9,q:19}],85:[function(e,t,o){var n=e("backbone").Model.extend({defaults:{type:"MyError"},toString:function(){return this.get("type")+": "+this.get("msg")},getMsg:function(){return this.get("msg")||console.warn("my error without message"),this.get("msg")}}),a=o.CommandProcessError=n.extend({defaults:{type:"Command Process Error"}}),i=o.CommandResult=n.extend({defaults:{type:"Command Result"}}),r=o.Warning=n.extend({defaults:{type:"Warning"}}),s=o.GitError=n.extend({defaults:{type:"Git Error"}});o.filterError=function(e){if(!(e instanceof a||e instanceof s||e instanceof i||e instanceof r))throw e}},{backbone:1}],86:[function(e,t,o){var n={"&":"&amp;","<":"&lt;",">":"&gt;",'"':"&quot;","'":"&#x27;","/":"&#x2F;"};t.exports=function(e){return(""+e).replace(/[&<>"'\/]/g,(function(e){return n[e]}))}},{}],87:[function(e,t,o){function n(e){this.eventMap={},this.options=e||{}}n.prototype.stealBaton=function(e,t,o){if(!e)throw new Error("need name");if(!t)throw new Error("need func!");var n=this.eventMap[e]||[];n.push({func:t,context:o}),this.eventMap[e]=n},n.prototype.sliceOffArgs=function(e,t){for(var o=[],n=e;n<t.length;n++)o.push(t[n]);return o},n.prototype.trigger=function(e){var t=this.sliceOffArgs(1,arguments),o=this.eventMap[e];if(o&&o.length){var n=o.slice(-1)[0];n.func.apply(n.context,t)}else console.warn("no listeners for",e)},n.prototype.getNumListeners=function(e){return(this.eventMap[e]||[]).length},n.prototype.getListenersThrow=function(e){var t=this.eventMap[e];if(!t||!t.length)throw new Error("no one has that baton!"+e);return t},n.prototype.passBatonBackSoft=function(e,t,o,n){try{return this.passBatonBack(e,t,o,n)}catch(e){}},n.prototype.passBatonBack=function(e,t,o,n){var a,i=this.getListenersThrow(e);if(i.forEach((function(e,n){0!==n&&e.func===t&&e.context===o&&(a=n-1)})),void 0===a)throw new Error("you are the last baton holder! or i didn't find you");var r=i[a];r.func.apply(r.context,n)},n.prototype.releaseBaton=function(e,t,o){var n=this.getListenersThrow(e),a=[],i=!1;if(n.forEach((function(e){e.func===t&&e.context===o?(i&&(console.warn("woah duplicates!!!"),console.log(n)),i=!0):a.push(e)})),!i)throw console.log("did not find that function",t,o,e,arguments),console.log(this.eventMap),new Error("can't releasebaton if you don't have it");this.eventMap[e]=a},o.EventBaton=n},{}],88:[function(e,t,o){var{readdirSync:n,lstatSync:a}=e("fs"),{join:i}=e("path"),r=e("../util/escapeString");e("../util/constants");o.parseQueryString=function(e){var t={};return e.replace(new RegExp("([^?=&]+)(=([^&]*))?","g"),(function(e,o,n,a){t[o]=a})),t},o.isBrowser=function(){return"undefined"!==String(typeof window)},o.splitTextCommand=function(e,t,o){t=t.bind(o),e.split(";").forEach((function(e,o){e=(e=r(e)).replace(/^(\s+)/,"").replace(/(\s+)$/,"").replace(/&quot;/g,'"').replace(/&#x27;/g,"'").replace(/&#x2F;/g,"/"),o>0&&!e.length||t(e)}))},o.genParseCommand=function(e,t){return function(o){var n,a;return Object.keys(e).forEach((function(t){var i=e[t].exec(o);i&&(n=t,a=i)})),!!n&&{toSet:{eventName:t,method:n,regexResults:a}}}},o.readDirDeep=function(e){var t=[];return n(e).forEach((function(n){var r=i(e,n);a(r).isDirectory()?t.push(...o.readDirDeep(r)):t.push(r)})),t}},{"../util/constants":82,"../util/escapeString":86,fs:3,path:12}],89:[function(e,t,o){"use strict";t.exports=function(e){var t={};for(var o in e)e.hasOwnProperty(o)&&(t[o]=o);return t}},{}],90:[function(e,t,o){e("backbone");var n=e("../app"),a=function(e){return{37:"left",38:"up",39:"right",40:"down",27:"esc",13:"enter"}[e]};function i(e){this.events=e.events,this.aliasMap=e.aliasMap||{},e.wait||this.listen()}i.prototype.listen=function(){this.listening||(this.listening=!0,n.getEventBaton().stealBaton("docKeydown",this.keydown,this))},i.prototype.mute=function(){this.listening=!1,n.getEventBaton().releaseBaton("docKeydown",this.keydown,this)},i.prototype.keydown=function(e){var t=e.which||e.keyCode,o=a(t);void 0!==o&&this.fireEvent(o,e)},i.prototype.fireEvent=function(e,t){e=this.aliasMap[e]||e,this.events.trigger(e,t)},i.prototype.passEventBack=function(e){n.getEventBaton().passBatonBackSoft("docKeydown",this.keydown,this,[e])},o.KeyboardListener=i,o.mapKeycodeToKey=a},{"../app":44,backbone:1}],91:[function(e,t,o){o.mock=function(e){var t={},o=function(){};for(var n in e.prototype)t[n]=o;return t}},{}],92:[function(e,t,o){o.joinClasses=function(e){return e.join(" ")}},{}],93:[function(e,t,o){t.exports=function(e,t){var o=!1;return function(){o||(e.apply(this,arguments),o=!0,setTimeout((function(){o=!1}),t))}}},{}],94:[function(e,t,o){var n=!0;o.detectZoom=function(){return window.outerWidth&&window.innerWidth?window.outerWidth/window.innerWidth:(n&&(console.warn("Can't detect zoom level correctly :-/"),n=!1),1)}},{}],95:[function(e,t,o){var n=e("underscore"),a=e("q"),i=e("../views"),r=e("../util/throttle"),s=i.ModalTerminal,c=i.ContainedBase,m=c.extend({tagName:"div",className:"textGrabber box vertical",template:n.template($("#text-grabber").html()),initialize:function(e){e=e||{},this.JSON={helperText:e.helperText||"Enter some text"},this.container=e.container||new s({title:"Enter some text"}),this.render(),e.initialText&&this.setText(e.initialText),e.wait||this.show()},getText:function(){return this.$("textarea").val()},setText:function(e){this.$("textarea").val(e)}}),l=c.extend({tagName:"div",className:"markdownGrabber box horizontal",template:n.template($("#markdown-grabber-view").html()),events:{"keyup textarea":"keyup"},initialize:function(e){if(e=e||{},this.deferred=e.deferred||a.defer(),e.fromObj&&(e.fillerText=e.fromObj.options.markdowns.join("\n")),this.JSON={previewText:e.previewText||"Preview",fillerText:e.fillerText||"## Enter some markdown!\n\n\n"},this.container=e.container||new s({title:e.title||"Enter some markdown"}),this.render(),!e.withoutButton){var t=a.defer();t.promise.then(this.confirmed.bind(this)).fail(this.cancelled.bind(this)).done();new i.ConfirmCancelView({deferred:t,destination:this.getDestination()})}this.updatePreview(),e.wait||this.show()},confirmed:function(){this.die(),this.deferred.resolve(this.getRawText())},cancelled:function(){this.die(),this.deferred.resolve()},keyup:function(){this.throttledPreview||(this.throttledPreview=r(this.updatePreview.bind(this),500)),this.throttledPreview()},getRawText:function(){return this.$("textarea").val()},exportToArray:function(){return this.getRawText().split("\n")},getExportObj:function(){return{markdowns:this.exportToArray()}},updatePreview:function(){var t=this.getRawText(),o=e("markdown").markdown.toHTML(t);this.$("div.insidePreview").html(o)}}),u=c.extend({tagName:"div",className:"markdownPresenter box vertical",template:n.template($("#markdown-presenter").html()),initialize:function(e){(e=e||{},this.deferred=e.deferred||a.defer(),this.JSON={previewText:e.previewText||"Here is something for you",fillerText:e.fillerText||"# Yay"},this.container=new s({title:"Check this out..."}),this.render(),e.noConfirmCancel)||new i.ConfirmCancelView({destination:this.getDestination()}).deferred.promise.then(function(){this.deferred.resolve(this.grabText())}.bind(this)).fail(function(){this.deferred.reject()}.bind(this)).done(this.die.bind(this));this.show()},grabText:function(){return this.$("textarea").val()}}),d=c.extend({tagName:"div",className:"demonstrationBuilder box vertical",template:n.template($("#demonstration-builder").html()),events:{"click div.testButton":"testView"},initialize:function(e){if(e=e||{},this.deferred=e.deferred||a.defer(),e.fromObj){var t=e.fromObj.options;e=Object.assign({},e,t,{beforeMarkdown:t.beforeMarkdowns.join("\n"),afterMarkdown:t.afterMarkdowns.join("\n")})}this.JSON={},this.container=new s({title:"Demonstration Builder"}),this.render(),this.beforeMarkdownView=new l({container:this,withoutButton:!0,fillerText:e.beforeMarkdown,previewText:"Before demonstration Markdown"}),this.beforeCommandView=new m({container:this,helperText:"The git command(s) to set up the demonstration view (before it is displayed)",initialText:e.beforeCommand||"git checkout -b bugFix"}),this.commandView=new m({container:this,helperText:"The git command(s) to demonstrate to the reader",initialText:e.command||"git commit"}),this.afterMarkdownView=new l({container:this,withoutButton:!0,fillerText:e.afterMarkdown,previewText:"After demonstration Markdown"});var o=a.defer();new i.ConfirmCancelView({deferred:o,destination:this.getDestination()});o.promise.then(this.confirmed.bind(this)).fail(this.cancelled.bind(this)).done()},testView:function(){new(0,e("../views/multiView").MultiView)({childViews:[{type:"GitDemonstrationView",options:this.getExportObj()}]})},getExportObj:function(){return{beforeMarkdowns:this.beforeMarkdownView.exportToArray(),afterMarkdowns:this.afterMarkdownView.exportToArray(),command:this.commandView.getText(),beforeCommand:this.beforeCommandView.getText()}},confirmed:function(){this.die(),this.deferred.resolve(this.getExportObj())},cancelled:function(){this.die(),this.deferred.resolve()},getInsideElement:function(){return this.$(".insideBuilder")[0]}}),h=c.extend({tagName:"div",className:"multiViewBuilder box vertical",template:n.template($("#multi-view-builder").html()),typeToConstructor:{ModalAlert:l,GitDemonstrationView:d},events:{"click div.deleteButton":"deleteOneView","click div.testButton":"testOneView","click div.editButton":"editOneView","click div.testEntireView":"testEntireView","click div.addView":"addView","click div.saveView":"saveView","click div.cancelView":"cancel"},initialize:function(e){e=e||{},this.deferred=e.deferred||a.defer(),this.multiViewJSON=e.multiViewJSON||{},this.JSON={views:this.getChildViews(),supportedViews:Object.keys(this.typeToConstructor)},this.container=new s({title:"Build a MultiView!"}),this.render(),this.show()},saveView:function(){this.hide(),this.deferred.resolve(this.multiViewJSON)},cancel:function(){this.hide(),this.deferred.resolve()},addView:function(e){var t=e.target,o=$(t).attr("data-type"),n=a.defer(),i=new(0,this.typeToConstructor[o])({deferred:n});n.promise.then(function(){var e={type:o,options:i.getExportObj()};this.addChildViewObj(e)}.bind(this)).fail((function(){})).done()},testOneView:function(t){var o=t.target,n=$(o).attr("data-index"),a=this.getChildViews()[n];new(0,e("../views/multiView").MultiView)({childViews:[a]})},testEntireView:function(){new(0,e("../views/multiView").MultiView)({childViews:this.getChildViews()})},editOneView:function(e){var t=e.target,o=$(t).attr("data-index"),n=$(t).attr("data-type"),i=a.defer(),r=new this.typeToConstructor[n]({deferred:i,fromObj:this.getChildViews()[o]});i.promise.then(function(){var e={type:n,options:r.getExportObj()},t=this.getChildViews();t[o]=e,this.setChildViews(t)}.bind(this)).fail((function(){})).done()},deleteOneView:function(e){var t=e.target,o=$(t).attr("data-index"),n=this.getChildViews(),a=n.slice(0,o).concat(n.slice(o+1));this.setChildViews(a),this.update()},addChildViewObj:function(e,t){var o=this.getChildViews();o.push(e),this.setChildViews(o),this.update()},setChildViews:function(e){this.multiViewJSON.childViews=e},getChildViews:function(){return this.multiViewJSON.childViews||[]},update:function(){this.JSON.views=this.getChildViews(),this.renderAgain()}});o.MarkdownGrabber=l,o.DemonstrationBuilder=d,o.TextGrabber=m,o.MultiViewBuilder=h,o.MarkdownPresenter=u},{"../util/throttle":93,"../views":98,"../views/multiView":100,markdown:9,q:19,underscore:36}],96:[function(e,t,o){var n=e("backbone"),a=e("../app"),i=e("../stores/CommandLineStore"),r=e("../actions/CommandLineActions"),s=e("../log"),c=e("../util/keyboard"),m=n.View.extend({initialize:function(){a.getEvents().on("commandSubmittedPassive",this.addToCommandHistory,this),this.index=-1,this.commandParagraph=this.$("#prompt p.command")[0],this.focus(),a.getEvents().on("rollupCommands",this.rollupCommands,this),a.getEventBaton().stealBaton("keydown",this.onKeyDown,this),a.getEventBaton().stealBaton("keyup",this.onKeyUp,this),this.updatePrompt(" ")},events:{"blur #commandTextField":"hideCursor","focus #commandTextField":"showCursor"},blur:function(){this.hideCursor()},focus:function(){this.$("#commandTextField").focus(),this.showCursor()},hideCursor:function(){this.toggleCursor(!1)},showCursor:function(){this.toggleCursor(!0)},toggleCursor:function(e){$(this.commandParagraph).toggleClass("showCursor",e)},onKeyDown:function(e){if(9!==e.keyCode){var t=e.target;this.updatePrompt(t)}else e.preventDefault()},onKeyUp:function(e){this.onKeyDown(e);var t={enter:function(){this.submit()}.bind(this),up:function(){this.commandSelectChange(1)}.bind(this),down:function(){this.commandSelectChange(-1)}.bind(this)},o=c.mapKeycodeToKey(e.which||e.keyCode);void 0!==t[o]&&(e.preventDefault(),t[o](),this.onKeyDown(e))},badHtmlEncode:function(e){return e.replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/</g,"&lt;").replace(/ /g,"&nbsp;").replace(/\n/g,"")},updatePrompt:function(e){e=e||{};var t=$("#commandTextField").val(),o=e.selectionStart,n=e.selectionEnd;t.length?o===n?(t+=" ",n+=1):void 0!==o&&void 0!==n||(o=Math.max(t.length-1,0),n=t.length):(t=" ",o=0,n=1);var i=t.substring(0,o),r=t.substring(o,n),s=t.substring(n,t.length),c="<span>"+this.badHtmlEncode(i)+'</span><span class="commandCursor">'+this.badHtmlEncode(r)+"</span><span>"+this.badHtmlEncode(s)+"</span>";this.commandParagraph.innerHTML=c,a.getEvents().trigger("commandScrollDown")},commandSelectChange:function(e){if(this.index+=e,this.index>=i.getCommandHistoryLength()||this.index<0)return this.clear(),void(this.index=-1);var t=i.getCommandHistory()[this.index];this.setTextField(t)},setTextField:function(e){this.$("#commandTextField").val(e)},clear:function(){this.setTextField("")},submit:function(){var e=this.$("#commandTextField").val().replace("\n","");this.clear(),this.submitCommand(e),this.index=-1},rollupCommands:function(e){var t=i.getCommandHistory().slice(1,Number(e)+1);t.reverse();var o="";t.forEach((function(e){o+=e+";"}),this),r.submitCommand(o)},addToCommandHistory:function(e){(e.length&&-1===this.index||e.length&&-1!==this.index&&i.getCommandHistory()[this.index]!==e)&&(r.submitCommand(e),s.commandEntered(e))},submitCommand:function(e){a.getEventBaton().trigger("commandSubmitted",e)}});o.CommandPromptView=m},{"../actions/CommandLineActions":40,"../app":44,"../log":65,"../stores/CommandLineStore":78,"../util/keyboard":90,backbone:1}],97:[function(e,t,o){var n=e("underscore"),a=e("q"),i=e("backbone"),r=e("../util"),s=e("../intl"),c=e("../util/keyboard").KeyboardListener,m=e("../models/commandModel").Command,l=e("../views").ModalTerminal,u=e("../views").ContainedBase,d=e("../visuals/visualization").Visualization,h=e("../git/headless"),p=u.extend({tagName:"div",className:"gitDemonstrationView box horizontal",template:n.template($("#git-demonstration-view").html()),events:{"click div.command > p.uiButton":"positive"},initialize:function(t){t=t||{},this.options=t,this.JSON=Object.assign({beforeMarkdowns:["## Git Commits","","Awesome!"],command:"git commit",afterMarkdowns:["Now you have seen it in action","","Go ahead and try the level!"]},t);var o=function(t){return e("markdown").markdown.toHTML(t.join("\n"))};this.JSON.beforeHTML=o(this.JSON.beforeMarkdowns),this.JSON.afterHTML=o(this.JSON.afterMarkdowns),this.container=new l({title:t.title||s.str("git-demonstration-title")}),this.render(),this.checkScroll(),this.navEvents=Object.assign({},i.Events),this.navEvents.on("positive",this.positive,this),this.navEvents.on("negative",this.negative,this),this.keyboardListener=new c({events:this.navEvents,aliasMap:{enter:"positive",right:"positive",left:"negative"},wait:!0}),this.visFinished=!1,this.initVis(),t.wait||this.show()},receiveMetaNav:function(e,t){e.navEvents.on("positive",this.positive,this),this.metaContainerView=t},checkScroll:function(){this.$("div.demonstrationText").children().toArray().map((function(e){return e.clientHeight})).reduce((function(e,t){return e+t}))<this.$("div.demonstrationText").height()&&this.$("div.demonstrationText").addClass("noLongText")},dispatchBeforeCommand:function(){if(this.options.beforeCommand){var e=a.defer();h.getTreeQuick(this.options.beforeCommand,e),e.promise.then(function(e){this.mainVis.gitEngine.loadTree(e),this.mainVis.gitVisuals.refreshTreeHarsh()}.bind(this))}},takeControl:function(){this.hasControl=!0,this.keyboardListener.listen(),this.metaContainerView&&this.metaContainerView.lock()},releaseControl:function(){this.hasControl&&(this.hasControl=!1,this.keyboardListener.mute(),this.metaContainerView&&this.metaContainerView.unlock())},reset:function(){this.mainVis.reset(),this.dispatchBeforeCommand(),this.demonstrated=!1,this.$el.toggleClass("demonstrated",!1),this.$el.toggleClass("demonstrating",!1)},positive:function(){!this.demonstrated&&this.hasControl&&(this.demonstrated=!0,this.demonstrate())},demonstrate:function(){this.$el.toggleClass("demonstrating",!0);var e=a.defer();this.dispatchCommand(this.JSON.command,e),e.promise.then(function(){this.$el.toggleClass("demonstrating",!1),this.$el.toggleClass("demonstrated",!0),this.releaseControl()}.bind(this))},negative:function(e){this.$el.hasClass("demonstrating")||this.keyboardListener.passEventBack(e)},dispatchCommand:function(e,t){var o=[];r.splitTextCommand(e,(function(e){o.push(new m({rawStr:e}))}),this);var n=a.defer(),i=n.promise;o.forEach((function(e,t){i=(i=i.then(function(){var t=a.defer();return this.mainVis.gitEngine.dispatch(e,t),t.promise}.bind(this))).then((function(){return a.delay(300)}))}),this),i=i.then((function(){t.resolve()})),n.resolve()},tearDown:function(){this.mainVis.tearDown(),p.__super__.tearDown.apply(this)},hide:function(){this.releaseControl(),this.reset(),this.visFinished&&(this.mainVis.setTreeIndex(-1),this.mainVis.setTreeOpacity(0)),this.shown=!1,p.__super__.hide.apply(this)},show:function(){this.takeControl(),this.visFinished&&setTimeout(function(){this.shown&&(this.mainVis.setTreeIndex(300),this.mainVis.showHarsh())}.bind(this),1.5*this.getAnimationTime()),this.shown=!0,p.__super__.show.apply(this)},die:function(){this.visFinished&&p.__super__.die.apply(this)},initVis:function(){this.mainVis=new d({el:this.$("div.visHolder div.visHolderInside")[0],noKeyboardInput:!0,noClick:!0,smallCanvas:!0,zIndex:-1}),this.mainVis.customEvents.on("paperReady",function(){this.visFinished=!0,this.dispatchBeforeCommand(),this.shown&&this.show()}.bind(this))}});o.GitDemonstrationView=p},{"../git/headless":54,"../intl":59,"../models/commandModel":68,"../util":88,"../util/keyboard":90,"../views":98,"../visuals/visualization":111,backbone:1,markdown:9,q:19,underscore:36}],98:[function(e,t,o){(function(t){var n=e("underscore"),a=e("q"),i=e("backbone"),r=e("../app"),s=e("../intl"),c=(e("../log"),e("../util/constants")),m=e("../util/keyboard").KeyboardListener,l=e("../util/debounce"),u=e("../util/throttle"),d=i.View.extend({getDestination:function(){return this.destination||this.container.getInsideElement()},tearDown:function(){this.$el.remove(),this.container&&this.container.tearDown()},renderAgain:function(e){e=e||this.template(this.JSON),this.$el.html(e)},render:function(e){this.renderAgain(e);var t=this.getDestination();$(t).append(this.el)}}),h=d.extend({resolve:function(){this.deferred.resolve()},reject:function(){this.deferred.reject()}}),p=d.extend({positive:function(){this.navEvents.trigger("positive")},exit:function(){this.navEvents.trigger("exit")},negative:function(){this.navEvents.trigger("negative")}}),g=d.extend({getAnimationTime:function(){return 700},show:function(){this.container.show()},hide:function(){this.container.hide()},die:function(){this.hide(),setTimeout(function(){this.tearDown()}.bind(this),1.1*this.getAnimationTime())}}),f=g.extend({tagName:"a",className:"generalButton uiButton",template:n.template($("#general-button").html()),events:{click:"click"},initialize:function(e){e=e||{},this.navEvents=e.navEvents||Object.assign({},i.Events),this.destination=e.destination,this.destination||(this.container=new y),this.JSON={buttonText:e.buttonText||"General Button",wantsWrapper:void 0===e.wantsWrapper||e.wantsWrapper},this.render(),this.container&&!e.wait&&this.show()},click:function(){this.clickFunc||(this.clickFunc=u(this.sendClick.bind(this),500)),this.clickFunc()},sendClick:function(){this.navEvents.trigger("click")}.bind(this)}),b=h.extend({tagName:"div",className:"confirmCancelView box horizontal justify",template:n.template($("#confirm-cancel-template").html()),events:{"click .confirmButton":"resolve","click .cancelButton":"reject"},initialize:function(e){if(!e.destination)throw new Error("needmore");this.destination=e.destination,this.deferred=e.deferred||a.defer(),this.JSON={confirm:e.confirm||"Confirm",cancel:e.cancel||"Cancel"},this.render()}}),v=p.extend({tagName:"div",className:"leftRightView box horizontal center",template:n.template($("#left-right-template").html()),initialize:function(e){if(!e.destination||!e.events)throw new Error("needmore");this.destination=e.destination,this.pipeEvents=e.events,this.navEvents=Object.assign({},i.Events),this.JSON={showLeft:void 0===e.showLeft||e.showLeft,lastNav:void 0!==e.lastNav&&e.lastNav},this.render(),this.$("div.right").click(this.positive.bind(this)),this.$("div.left").click(this.negative.bind(this)),this.$("div.exit").click(this.exit.bind(this))},exit:function(){this.pipeEvents.trigger("exit"),v.__super__.exit.apply(this)},positive:function(){this.pipeEvents.trigger("positive"),v.__super__.positive.apply(this)},negative:function(){this.pipeEvents.trigger("negative"),v.__super__.negative.apply(this)}}),w=i.View.extend({tagName:"div",className:"modalView box horizontal center transitionOpacityLinear",template:n.template($("#modal-view-template").html()),getAnimationTime:function(){return 700},initialize:function(e){this.shown=!1,this.render()},render:function(){this.$el.html(this.template({})),$("body").append(this.el)},stealKeyboard:function(){r.getEventBaton().stealBaton("keydown",this.onKeyDown,this),r.getEventBaton().stealBaton("keyup",this.onKeyUp,this),r.getEventBaton().stealBaton("windowFocus",this.onWindowFocus,this),r.getEventBaton().stealBaton("documentClick",this.onDocumentClick,this),$("#commandTextField").blur()},releaseKeyboard:function(){r.getEventBaton().releaseBaton("keydown",this.onKeyDown,this),r.getEventBaton().releaseBaton("keyup",this.onKeyUp,this),r.getEventBaton().releaseBaton("windowFocus",this.onWindowFocus,this),r.getEventBaton().releaseBaton("documentClick",this.onDocumentClick,this),r.getEventBaton().trigger("windowFocus")},onWindowFocus:function(e){},onDocumentClick:function(e){},onKeyDown:function(e){e.preventDefault()},onKeyUp:function(e){e.preventDefault()},show:function(){this.toggleZ(!0),t.nextTick(function(){this.toggleShow(!0)}.bind(this))},hide:function(){this.toggleShow(!1),setTimeout(function(){this.shown||this.toggleZ(!1)}.bind(this),this.getAnimationTime())},getInsideElement:function(){return this.$(".contentHolder")},toggleShow:function(e){this.shown!==e&&(e?this.stealKeyboard():this.releaseKeyboard(),this.shown=e,this.$el.toggleClass("show",e))},toggleZ:function(e){this.$el.toggleClass("inFront",e)},tearDown:function(){this.$el.html(""),$("body")[0].removeChild(this.el)}}),y=g.extend({tagName:"div",className:"modalTerminal box flex1",template:n.template($("#terminal-window-template").html()),events:{"click div.inside":"onClick"},initialize:function(e){e=e||{},this.navEvents=e.events||Object.assign({},i.Events),this.container=new w,this.JSON={title:e.title},this.render()},updateTitle:function(e){this.$(".modal-title").text(e)},onClick:function(){this.navEvents.trigger("click")},getInsideElement:function(){return this.$(".inside")}}),k=g.extend({tagName:"div",template:n.template($("#modal-alert-template").html()),initialize:function(e){this.options=e||{},this.JSON={title:e.title||"Something to say",text:e.text||"Here is a paragraph",markdown:e.markdown},e.markdowns&&(this.JSON.markdown=e.markdowns.join("\n")),this.container=new y({}),this.render(),e.wait||this.show()},render:function(){var t=this.JSON.markdown?e("markdown").markdown.toHTML(this.JSON.markdown):this.template(this.JSON);this.options._dangerouslyInsertHTML&&(t+=this.options._dangerouslyInsertHTML),k.__super__.render.apply(this,[t])}}),C=i.View.extend({initialize:function(e){e=e||{},this.deferred=e.deferred||a.defer(),this.modalAlert=new k(Object.assign({},{markdown:"#you sure?"},e));var t=a.defer();this.buttonDefer=t,this.confirmCancel=new b({deferred:t,destination:this.modalAlert.getDestination()}),t.promise.then(this.deferred.resolve).fail(this.deferred.reject).done(function(){this.close()}.bind(this)),this.navEvents=Object.assign({},i.Events),this.navEvents.on("positive",this.positive,this),this.navEvents.on("negative",this.negative,this),this.keyboardListener=new m({events:this.navEvents,aliasMap:{enter:"positive",esc:"negative"}}),e.wait||this.modalAlert.show()},positive:function(){this.buttonDefer.resolve()},negative:function(){this.buttonDefer.reject()},getAnimationTime:function(){return 700},show:function(){this.modalAlert.show()},hide:function(){this.modalAlert.hide()},getPromise:function(){return this.deferred.promise},close:function(){this.keyboardListener.mute(),this.modalAlert.die()}}),A=C.extend({initialize:function(t){var o,n=(t=t||{}).nextLevel?s.getName(t.nextLevel):"",a=s.getDialog(e("../dialogs/nextLevel"))[0].options.markdowns.join("\n");a=s.template(a,{numCommands:t.numCommands,best:t.best}),a=t.numCommands<=t.best?a+"\n\n"+s.str("finish-dialog-win"):a+"\n\n"+s.str("finish-dialog-lose",{best:t.best}),a+="\n\n",t.nextLevel?a+=s.str("finish-dialog-next",{nextLevel:n}):o='<p class="catchadream">'+s.str("finish-dialog-finished")+" (ﾉ^_^)ﾉ (ﾉ^_^)ﾉ (ﾉ^_^)ﾉ</p>",t=Object.assign({},t,{markdown:a,_dangerouslyInsertHTML:o}),A.__super__.initialize.apply(this,[t])}}),x=i.View.extend({initialize:function(e){this.grabBatons(),this.modalAlert=new k({markdowns:this.markdowns}),this.modalAlert.show()},grabBatons:function(){r.getEventBaton().stealBaton(this.eventBatonName,this.batonFired,this)},releaseBatons:function(){r.getEventBaton().releaseBaton(this.eventBatonName,this.batonFired,this)},finish:function(){this.releaseBatons(),this.modalAlert.die()}}),M=x.extend({initialize:function(e){this.eventBatonName="windowSizeCheck",this.markdowns=["## That window size is not supported :-/","Please resize your window back to a supported size","","(and of course, pull requests to fix this are appreciated :D)"],M.__super__.initialize.apply(this,[e])},batonFired:function(e){e.w>c.VIEWPORT.minWidth&&e.h>c.VIEWPORT.minHeight&&this.finish()}}),_=x.extend({initialize:function(e){if(!e||!e.level)throw new Error("need level");this.eventBatonName="zoomChange",this.markdowns=["## That zoom level of "+e.level+" is not supported :-/","Please zoom back to a supported zoom level with Ctrl + and Ctrl -","","(and of course, pull requests to fix this are appreciated :D)"],_.__super__.initialize.apply(this,[e])},batonFired:function(e){e<=c.VIEWPORT.maxZoom&&e>=c.VIEWPORT.minZoom&&this.finish()}}),D=d.extend({tagName:"div",className:"canvasTerminalHolder box flex1",template:n.template($("#terminal-window-bare-template").html()),events:{"click div.wrapper":"onClick"},initialize:function(e){e=e||{},this.parent=e.parent,this.minHeight=e.minHeight||200,this.destination=$("body"),this.JSON={title:e.title||s.str("goal-to-reach"),text:e.text||s.str("hide-goal")},this.render(),this.inDom=!0,this.$terminal=this.$el.find(".terminal-window-holder").first(),this.$terminal.height(.8*$(window).height()),this.$terminal.draggable({cursor:"move",handle:".toolbar",containment:"#interfaceWrapper",scroll:!1}),$(window).on("resize",l(this.recalcLayout.bind(this),300)),e.additionalClass&&this.$el.addClass(e.additionalClass)},getAnimationTime:function(){return 700},onClick:function(){this.die()},die:function(){this.minimize(),this.inDom=!1,setTimeout(function(){this.tearDown()}.bind(this),this.getAnimationTime())},minimize:function(){this.parent.trigger("minimizeCanvas",{left:this.$terminal.css("left"),top:this.$terminal.css("top")},{width:this.$terminal.css("width"),height:this.$terminal.css("height")}),this.$terminal.animate({height:"0px",opacity:0},this.getAnimationTime())},restore:function(e,t){var o=this;e=e||{top:this.$terminal.css("top"),left:this.$terminal.css("left")},t=t||{width:this.$terminal.css("width"),height:this.$terminal.css("height")},this.$terminal.css({top:e.top,left:e.left,width:t.width,height:"0px",opacity:"0"}),this.$terminal.animate({height:t.height,opacity:1},this.getAnimationTime(),(function(){o.recalcLayout()}))},recalcLayout:function(){var e=this.parent,t=0,o=0,n=0,a=this.$terminal.outerWidth(),i=this.$terminal.outerHeight(),r=this.$terminal.offset().left,s=this.$terminal.offset().top,c=$(window).width()-(r+a),m=$(window).height()-(s+i),l=.75*$(window).height(),u=.95*$(window).height();s<0&&(o=-s),r<0&&(t=-r),c<0&&(t=c),m<0&&(o=m),i<l&&(n=l-i),i>u&&(n=u-i),r=Math.max(r+t,0),s=Math.max(s+o,0),i=Math.max(i+n,l),this.$terminal.animate({left:r+"px",top:s+"px",height:i+"px"},this.getAnimationTime(),(function(){e.trigger("resizeCanvas")}))},getCanvasLocation:function(){return this.$("div.inside")[0]}});o.BaseView=d,o.GeneralButton=f,o.ModalView=w,o.ModalTerminal=y,o.ModalAlert=k,o.ContainedBase=g,o.ConfirmCancelView=b,o.LeftRightView=v,o.ZoomAlertWindow=_,o.ConfirmCancelTerminal=C,o.WindowSizeAlertWindow=M,o.CanvasTerminalHolder=D,o.NextLevelConfirm=A}).call(this,e("_process"))},{"../app":44,"../dialogs/nextLevel":49,"../intl":59,"../log":65,"../util/constants":82,"../util/debounce":83,"../util/keyboard":90,"../util/throttle":93,_process:13,backbone:1,markdown:9,q:19,underscore:36}],99:[function(e,t,o){var n=e("underscore"),a=(e("q"),e("backbone")),i=e("../stores/LocaleStore"),r=e("../util"),s=e("../util/debounce"),c=e("../intl"),m=e("../log"),l=e("../util/keyboard").KeyboardListener,u=e("../app"),d=e("../stores/LevelStore"),h=e("../views").ModalTerminal,p=e("../views").ContainedBase,g=e("../views").BaseView,f=e("../../levels"),b=p.extend({tagName:"div",className:"levelDropdownView box vertical",template:n.template($("#level-dropdown-view").html()),events:{"click div.levelDropdownTab":"onTabClick"},initialize:function(e){e=e||{};var t=r.parseQueryString(window.location.href);this.JSON={selectedTab:t.defaultTab||"main",tabs:[{id:"main",name:c.str("main-levels-tab")},{id:"remote",name:c.str("remote-levels-tab")}]},this.navEvents=Object.assign({},a.Events),this.navEvents.on("clickedID",s(this.loadLevelID.bind(this),300,!0)),this.navEvents.on("negative",this.negative,this),this.navEvents.on("positive",this.positive,this),this.navEvents.on("left",this.left,this),this.navEvents.on("right",this.right,this),this.navEvents.on("up",this.up,this),this.navEvents.on("down",this.down,this),this.keyboardListener=new l({events:this.navEvents,aliasMap:{esc:"negative",enter:"positive"},wait:!0}),this.sequences=d.getSequences(),this.sequenceToLevels=d.getSequenceToLevels(),this.container=new h({title:c.str("select-a-level")});var o=this;i.subscribe((function(){o.render.apply(o)})),d.subscribe((function(){o.render()})),this.render(),e.wait||this.show()},render:function(){this.container.updateTitle(c.str("select-a-level")),this.updateTabNames([c.str("main-levels-tab"),c.str("remote-levels-tab")]),b.__super__.render.apply(this,arguments),this.buildSequences()},onTabClick:function(e){var t=e.target||e.srcElement,o=$(t).attr("data-id");o!==this.JSON.selectedTab&&(this.selectedTab=o,this.updateTabTo(o))},updateTabTo:function(e){this.JSON.selectedTab=e,this.render(),this.selectedID&&(this.selectedSequence=this.getSequencesOnTab()[0],this.selectedIndex=0,this.updateSelectedIcon())},updateTabNames:function(e){for(var t=0;t<e.length;++t)this.JSON.tabs[t].name=e[t]},positive:function(){this.selectedID&&this.loadLevelID(this.selectedID)},left:function(){this.turnOnKeyboardSelection()||this.leftOrRight(-1)},updateSelectedIcon:function(){this.selectedID=this.getSelectedID(),this.selectIconByID(this.selectedID)},leftOrRight:function(e){this.deselectIconByID(this.selectedID);var t=this.selectedIndex+e,o=this.getCurrentSequence(),n=this.JSON.tabs;t>=o.length&&this.getTabIndex()+1<n.length?(this.switchToTabIndex(this.getTabIndex()+1),this.selectedIndex=0):t<0&&this.getTabIndex()-1>=0?(this.switchToTabIndex(this.getTabIndex()-1),this.selectedIndex=0):this.selectedIndex=this.wrapIndex(this.selectedIndex+e,this.getCurrentSequence()),this.updateSelectedIcon()},right:function(){this.turnOnKeyboardSelection()||this.leftOrRight(1)},up:function(){this.turnOnKeyboardSelection()||(this.selectedSequence=this.getPreviousSequence(),this.downOrUp())},down:function(){this.turnOnKeyboardSelection()||(this.selectedSequence=this.getNextSequence(),this.downOrUp())},downOrUp:function(){this.selectedIndex=this.boundIndex(this.selectedIndex,this.getCurrentSequence()),this.deselectIconByID(this.selectedID),this.updateSelectedIcon()},turnOnKeyboardSelection:function(){return!this.selectedID&&(this.selectFirst(),!0)},turnOffKeyboardSelection:function(){this.selectedID&&(this.deselectIconByID(this.selectedID),this.selectedID=void 0,this.selectedIndex=void 0,this.selectedSequence=void 0)},getTabIndex:function(){return this.JSON.tabs.map((function(e){return e.id})).indexOf(this.JSON.selectedTab)},switchToTabIndex:function(e){var t=this.JSON.tabs[e].id;this.updateTabTo(t)},wrapIndex:function(e,t){return e=(e=e>=t.length?0:e)<0?t.length-1:e},boundIndex:function(e,t){return e=(e=e>=t.length?t.length-1:e)<0?0:e},getSequencesOnTab:function(){return this.sequences.filter((function(e){return f.getTabForSequence(e)===this.JSON.selectedTab}),this)},getNextSequence:function(){var e=this.getSequenceIndex(this.selectedSequence),t=this.wrapIndex(e+1,this.getSequencesOnTab());return this.getSequencesOnTab()[t]},getPreviousSequence:function(){var e=this.getSequenceIndex(this.selectedSequence),t=this.wrapIndex(e-1,this.getSequencesOnTab());return this.getSequencesOnTab()[t]},getSequenceIndex:function(e){var t=this.getSequencesOnTab().indexOf(e);if(t<0)throw new Error("didnt find");return t},getIndexForID:function(e){return d.getLevel(e).index},selectFirst:function(){var e=this.sequenceToLevels[this.getSequencesOnTab()[0]][0].id;this.selectIconByID(e),this.selectedIndex=0,this.selectedSequence=this.getSequencesOnTab()[0]},getCurrentSequence:function(){return this.sequenceToLevels[this.selectedSequence]},getSelectedID:function(){return this.sequenceToLevels[this.selectedSequence][this.selectedIndex].id},selectIconByID:function(e){this.toggleIconSelect(e,!0)},deselectIconByID:function(e){this.toggleIconSelect(e,!1)},toggleIconSelect:function(e,t){this.selectedID=e,$("#levelIcon-"+e).toggleClass("selected",t),this.seriesViews.forEach((function(t){-1!==t.levelIDs.indexOf(e)&&t.updateAboutForLevelID(e)}),this)},negative:function(){this.hide()},testOption:function(e){return this.currentCommand&&new RegExp("--"+e).test(this.currentCommand.get("rawStr"))},show:function(e,t){this.currentCommand=t,this.updateSolvedStatus(),this.showDeferred=e,this.keyboardListener.listen(),b.__super__.show.apply(this)},hide:function(){this.showDeferred&&this.showDeferred.resolve(),this.showDeferred=void 0,this.keyboardListener.mute(),this.turnOffKeyboardSelection(),b.__super__.hide.apply(this)},loadLevelID:function(e){if(!this.testOption("noOutput")){u.getEventBaton().trigger("commandSubmitted","level "+e);var t=d.getLevel(e).name.en_US;m.levelSelected(t)}this.hide()},updateSolvedStatus:function(){this.seriesViews.forEach((function(e){e.updateSolvedStatus()}),this)},buildSequences:function(){this.seriesViews=[],this.getSequencesOnTab().forEach((function(e){this.seriesViews.push(new v({destination:this.$el,name:e,navEvents:this.navEvents}))}),this)}}),v=g.extend({tagName:"div",className:"seriesView box flex1 vertical",template:n.template($("#series-view").html()),events:{"click div.levelIcon":"click","mouseenter div.levelIcon":"enterIcon"},initialize:function(e){this.name=e.name||"intro",this.navEvents=e.navEvents,this.info=d.getSequenceInfo(this.name),this.levels=d.getLevelsInSequence(this.name),this.levelIDs=[];var t=null;this.levels.forEach((function(e){null===t&&(t=this.formatLevelAbout(e.id)),this.levelIDs.push(e.id)}),this),this.destination=e.destination,this.JSON={displayName:c.getIntlKey(this.info,"displayName"),about:c.getIntlKey(this.info,"about")||"&nbsp;",levelInfo:t,ids:this.levelIDs},this.render(),this.updateSolvedStatus()},updateSolvedStatus:function(){this.$("div.levelIcon").each((function(e,t){var o=$(t).attr("data-id");$(t).toggleClass("solved",d.isLevelSolved(o))}))},getEventID:function(e){var t=e.target;return $(t).attr("data-id")},setAbout:function(e){this.$("p.levelInfo").text(e)},enterIcon:function(e){var t=this.getEventID(e);this.updateAboutForLevelID(t)},updateAboutForLevelID:function(e){this.setAbout(this.formatLevelAbout(e))},formatLevelAbout:function(e){var t=d.getLevel(e);return this.getLevelNumberFromID(e)+": "+c.getName(t)},getLevelNumberFromID:function(e){return e.replace(/[^0-9]/g,"")},click:function(e){var t=this.getEventID(e);this.navEvents.trigger("clickedID",t)}});o.LevelDropdownView=b},{"../../levels":113,"../app":44,"../intl":59,"../log":65,"../stores/LevelStore":80,"../stores/LocaleStore":81,"../util":88,"../util/debounce":83,"../util/keyboard":90,"../views":98,backbone:1,q:19,underscore:36}],100:[function(e,t,o){var n=e("q"),a=e("backbone"),i=e("../views").LeftRightView,r=e("../views").ModalAlert,s=e("../views/gitDemonstrationView").GitDemonstrationView,c=e("../views/builderViews").MarkdownPresenter,m=e("../util/keyboard").KeyboardListener,l=e("../util/debounce"),u=a.View.extend({tagName:"div",className:"multiView",navEventDebounce:550,deathTime:700,typeToConstructor:{ModalAlert:r,GitDemonstrationView:s,MarkdownPresenter:c},initialize:function(e){e=e||{},this.childViewJSONs=e.childViews||[{type:"ModalAlert",options:{markdown:"Woah wtf!!"}},{type:"GitDemonstrationView",options:{command:"git checkout -b side; git commit; git commit"}},{type:"ModalAlert",options:{markdown:"Im second"}}],this.deferred=e.deferred||n.defer(),this.childViews=[],this.currentIndex=0,this.navEvents=Object.assign({},a.Events),this.navEvents.on("negative",this.getNegFunc(),this),this.navEvents.on("positive",this.getPosFunc(),this),this.navEvents.on("quit",this.finish,this),this.navEvents.on("exit",this.finish,this),this.keyboardListener=new m({events:this.navEvents,aliasMap:{left:"negative",right:"positive",enter:"positive",esc:"quit"}}),this.render(),e.wait||this.start()},onWindowFocus:function(){},getAnimationTime:function(){return 700},getPromise:function(){return this.deferred.promise},getPosFunc:function(){return l(function(){this.navForward()}.bind(this),this.navEventDebounce,!0)},getNegFunc:function(){return l(function(){this.navBackward()}.bind(this),this.navEventDebounce,!0)},lock:function(){this.locked=!0},unlock:function(){this.locked=!1},navForward:function(){if(!this.locked)return this.currentIndex===this.childViews.length-1?(this.hideViewIndex(this.currentIndex),void this.finish()):void this.navIndexChange(1)},navBackward:function(){0!==this.currentIndex&&this.navIndexChange(-1)},navIndexChange:function(e){this.hideViewIndex(this.currentIndex),this.currentIndex+=e,this.showViewIndex(this.currentIndex)},hideViewIndex:function(e){this.childViews[e].hide()},showViewIndex:function(e){this.childViews[e].show()},finish:function(){this.keyboardListener.mute(),this.childViews.forEach((function(e){e.die()})),this.deferred.resolve()},start:function(){this.showViewIndex(this.currentIndex)},createChildView:function(e){var t=e.type;if(!this.typeToConstructor[t])throw new Error('no constructor for type "'+t+'"');return new this.typeToConstructor[t](Object.assign({},e.options,{wait:!0}))},addNavToView:function(e,t){var o=new i({events:this.navEvents,destination:e.getDestination(),showLeft:0!==t,lastNav:t===this.childViewJSONs.length-1});e.receiveMetaNav&&e.receiveMetaNav(o,this)},render:function(){this.childViewJSONs.forEach((function(e,t){var o=this.createChildView(e);this.childViews.push(o),this.addNavToView(o,t)}),this)}});o.MultiView=u},{"../util/debounce":83,"../util/keyboard":90,"../views":98,"../views/builderViews":95,"../views/gitDemonstrationView":97,backbone:1,q:19}],101:[function(e,t,o){e("../util/errors").GitError;var n=e("underscore"),a=e("q"),i=e("backbone"),r=e("../views").ModalTerminal,s=e("../views").ContainedBase,c=e("../views").ConfirmCancelView,m=s.extend({tagName:"div",template:n.template($("#interactive-rebase-template").html()),initialize:function(e){this.deferred=e.deferred,this.rebaseMap={},this.entryObjMap={},this.options=e,this.rebaseEntries=new u,e.toRebase.reverse(),e.toRebase.forEach((function(e){var t=e.get("id");this.rebaseMap[t]=e,this.entryObjMap[t]=new l({id:t}),this.rebaseEntries.add(this.entryObjMap[t])}),this),this.container=new r({title:"Interactive Rebase"}),this.render(),this.show(),e.aboveAll&&$("#canvasHolder").css("display","none")},restoreVis:function(){$("#canvasHolder").css("display","inherit")},confirm:function(){this.die(),this.options.aboveAll&&this.restoreVis();var e=[];this.$("ul.rebaseEntries li").each((function(t,o){e.push(o.id)}));var t=[];e.forEach((function(e){this.entryObjMap[e].get("pick")&&t.unshift(this.rebaseMap[e])}),this),t.reverse(),this.deferred.resolve(t),this.$el.html("")},render:function(){var e={num:Object.keys(this.rebaseMap).length,solutionOrder:this.options.initialCommitOrdering},t=this.container.getInsideElement();this.$el.html(this.template(e)),$(t).append(this.el);var o=this.$("ul.rebaseEntries");this.rebaseEntries.each((function(e){new d({el:o,model:e})}),this),o.sortable({axis:"y",placeholder:"rebaseEntry transitionOpacity ui-state-highlight",appendTo:"parent"}),this.makeButtons()},cancel:function(){this.hide(),this.options.aboveAll&&this.restoreVis(),this.deferred.resolve([])},makeButtons:function(){var e=a.defer();e.promise.then(function(){this.confirm()}.bind(this)).fail(function(){this.cancel()}.bind(this)).done(),new c({destination:this.$(".confirmCancel"),deferred:e})}}),l=i.Model.extend({defaults:{pick:!0},toggle:function(){this.set("pick",!this.get("pick"))}}),u=i.Collection.extend({model:l}),d=i.View.extend({tagName:"li",template:n.template($("#interactive-rebase-entry-template").html()),toggle:function(){this.model.toggle(),this.listEntry.toggleClass("notPicked",!this.model.get("pick"))},initialize:function(e){this.render()},render:function(){this.$el.append(this.template(this.model.toJSON())),this.listEntry=this.$el.children(":last"),this.listEntry.delegate("#toggleButton","click",function(){this.toggle()}.bind(this))}});o.InteractiveRebaseView=m},{"../util/errors":85,"../views":98,backbone:1,q:19,underscore:36}],102:[function(e,t,o){e("backbone");var n=e("q"),a=e("./index").Animation,i=e("./index").PromiseAnimation,r=e("../../util/constants").GRAPHICS,s={},c=function(e,t){var o=1*r.defaultAnimationTime,n=2*o;return{animation:function(){e.refreshTree(o),t.setBirth(),t.parentInFront(),e.visBranchesFront(),t.animateUpdatedPosition(n,"bounce"),t.animateOutgoingEdges(o)},duration:Math.max(o,n)}};s.genCommitBirthAnimation=function(e,t,o){if(!e)throw new Error("Need animation queue to add closure to!");var n=t.get("visNode"),i=c(o,n);e.add(new a({closure:i.animation,duration:i.duration}))},s.genCommitBirthPromiseAnimation=function(e,t){var o=e.get("visNode");return new i(c(t,o))},s.highlightEachWithPromise=function(e,t,o){return t.forEach(function(t){e=e.then(function(){return this.playHighlightPromiseAnimation(t,o)}.bind(this))}.bind(this)),e},s.playCommitBirthPromiseAnimation=function(e,t){var o=this.genCommitBirthPromiseAnimation(e,t);return o.play(),o.getPromise()},s.playRefreshAnimationAndFinish=function(e,t){var o=new i({closure:function(){e.refreshTree()}});o.play(),t.thenFinish(o.getPromise())},s.genRefreshPromiseAnimation=function(e){return new i({closure:function(){e.refreshTree()}})},s.playRefreshAnimationSlow=function(e){var t=r.defaultAnimationTime;return this.playRefreshAnimation(e,2*t)},s.playRefreshAnimation=function(e,t){var o=new i({duration:t,closure:function(){e.refreshTree(t)}});return o.play(),o.getPromise()},s.refreshTree=function(e,t){e.add(new a({closure:function(){t.refreshTree()}}))},s.genHighlightPromiseAnimation=function(e,t){var o=t.get("visBranch")||t.get("visNode")||t.get("visTag");if(!o)throw console.log(t),new Error("could not find vis object for dest obj");var n=e.get("visNode");return new i(function(e,t){var o=2*(.66*r.defaultAnimationTime);return{animation:function(){e.highlightTo(t,o,"easeInOut")},duration:1.5*o}}(n,o))},s.playHighlightPromiseAnimation=function(e,t){var o=this.genHighlightPromiseAnimation(e,t);return o.play(),o.getPromise()},s.getDelayedPromise=function(e){var t=n.defer();return setTimeout(t.resolve,e||1e3),t.promise},s.delay=function(e,t){t=t||r.defaultAnimationTime,e.add(new a({closure:function(){},duration:t}))},o.AnimationFactory=s},{"../../util/constants":82,"./index":103,backbone:1,q:19}],103:[function(e,t,o){var n=e("q"),a=e("backbone"),i=e("../../actions/GlobalStateActions"),r=e("../../util/constants").GRAPHICS,s=a.Model.extend({defaults:{duration:r.defaultAnimationTime,closure:null},validateAtInit:function(){if(!this.get("closure"))throw new Error("give me a closure!")},initialize:function(e){this.validateAtInit()},run:function(){this.get("closure")()}}),c=a.Model.extend({defaults:{animations:null,index:0,callback:null,defer:!1,promiseBased:!1},initialize:function(e){this.set("animations",[]),e.callback||console.warn("no callback")},thenFinish:function(e,t){e.then(function(){this.finish()}.bind(this)),e.fail((function(e){throw console.log("uncaught error",e),e})),this.set("promiseBased",!0),t&&t.resolve()},add:function(e){if(!(e instanceof s))throw new Error("Need animation not something else");this.get("animations").push(e)},start:function(){this.set("index",0),i.changeIsAnimating(!0),this.next()},finish:function(){i.changeIsAnimating(!1),this.get("callback")()},next:function(){var e=this.get("animations"),t=this.get("index");if(t>=e.length)this.finish();else{var o=e[t],n=o.get("duration");o.run(),this.set("index",t+1),setTimeout(function(){this.next()}.bind(this),n)}}}),m=a.Model.extend({defaults:{deferred:null,closure:null,duration:r.defaultAnimationTime},initialize:function(e){if(!e.closure&&!e.animation)throw new Error("need closure or animation");this.set("closure",e.closure||e.animation),this.set("duration",e.duration||this.get("duration")),this.set("deferred",e.deferred||n.defer())},getPromise:function(){return this.get("deferred").promise},play:function(){this.get("closure")(),setTimeout(function(){this.get("deferred").resolve()}.bind(this),this.get("duration"))},then:function(e){return this.get("deferred").promise.then(e)}});m.fromAnimation=function(e){return new m({closure:e.get("closure"),duration:e.get("duration")})},o.Animation=s,o.PromiseAnimation=m,o.AnimationQueue=c},{"../../actions/GlobalStateActions":41,"../../util/constants":82,backbone:1,q:19}],104:[function(e,t,o){var n=e("q"),a=e("../intl"),i=e("../util/constants").GRAPHICS,r=e("../util/debounce"),s=e("../stores/GlobalStateStore"),c=e("../visuals/visNode").VisNode,m=e("../visuals/visBranch").VisBranch,l=e("../visuals/visBranch").VisBranchCollection,u=e("../visuals/visTag").VisTag,d=e("../visuals/visTag").VisTagCollection,h=e("../visuals/visEdge").VisEdge,p=e("../visuals/visEdge").VisEdgeCollection;function g(t){t=t||{},this.options=t,this.visualization=t.visualization,this.commitCollection=t.commitCollection,this.branchCollection=t.branchCollection,this.tagCollection=t.tagCollection,this.visNodeMap={},this.visEdgeCollection=new p,this.visBranchCollection=new l,this.visTagCollection=new d,this.commitMap={},this.rootCommit=null,this.branchStackMap=null,this.tagStackMap=null,this.upstreamBranchSet=null,this.upstreamTagSet=null,this.upstreamHeadSet=null,this.paper=t.paper,this.gitReady=!1,this.branchCollection.on("add",this.addBranchFromEvent,this),this.branchCollection.on("remove",this.removeBranch,this),this.tagCollection.on("add",this.addTagFromEvent,this),this.tagCollection.on("remove",this.removeTag,this),this.deferred=[],this.flipFraction=.65;var o=e("../app"),n=this;this._onRefreshTree=function(){n.refreshTree()},o.getEvents().on("refreshTree",this._onRefreshTree,this)}g.prototype.defer=function(e){this.deferred.push(e)},g.prototype.deferFlush=function(){this.deferred.forEach((function(e){e()}),this),this.deferred=[]},g.prototype.resetAll=function(){this.visEdgeCollection.toArray().forEach((function(e){e.remove()}),this),this.visBranchCollection.toArray().forEach((function(e){e.remove()}),this),this.visTagCollection.toArray().forEach((function(e){e.remove()}),this),Object.values(this.visNodeMap).forEach((function(e){e.remove()}),this),this.visEdgeCollection.reset(),this.visBranchCollection.reset(),this.visTagCollection.reset(),this.visNodeMap={},this.rootCommit=null,this.commitMap={}},g.prototype.tearDown=function(){this.resetAll(),this.paper.remove(),e("../app").getEvents().removeListener("refreshTree",this._onRefreshTree)},g.prototype.assignGitEngine=function(e){this.gitEngine=e,this.initHeadBranch(),this.deferFlush()},g.prototype.getVisualization=function(){return this.visualization},g.prototype.initHeadBranch=function(){this.addBranchFromEvent(this.gitEngine.HEAD)},g.prototype.getScreenPadding=function(){var e=s.getFlipTreeY()?3:1.5;return{widthPadding:1.5*i.nodeRadius,topHeightPadding:i.nodeRadius*e,bottomHeightPadding:5*i.nodeRadius}},g.prototype.getPosBoundaries=function(){return this.gitEngine.hasOrigin()?{min:0,max:.5}:this.gitEngine.isOrigin()?{min:.5,max:1}:{min:0,max:1}},g.prototype.getFlipPos=function(){var e=this.getPosBoundaries(),t=e.min,o=e.max;return this.flipFraction*(o-t)+t},g.prototype.getIsGoalVis=function(){return!!this.options.isGoalVis},g.prototype.getLevelBlob=function(){return this.visualization.options.levelBlob||{}},g.prototype.toScreenCoords=function(e){if(!this.paper.width)throw new Error("being called too early for screen coords");var t,o,n,a,i=this.getScreenPadding(),r=function(e,t,o){return o+e*(t-2*o)}(e.x,this.paper.width,i.widthPadding),c=(t=e.y,o=this.paper.height,n=i.topHeightPadding,a=i.bottomHeightPadding,n+t*(o-a-n));return s.getFlipTreeY()&&(c=this.paper.height-c),{x:r,y:c}},g.prototype.animateAllAttrKeys=function(e,t,o,a){var r=n.defer(),s=function(n){n.animateAttrKeys(e,t,o,a)};this.visBranchCollection.each(s),this.visEdgeCollection.each(s),this.visTagCollection.each(s),Object.values(this.visNodeMap).forEach(s);var c=void 0!==o?o:i.defaultAnimationTime;return setTimeout((function(){r.resolve()}),c),r.promise},g.prototype.finishAnimation=function(e){if(!(e=e||1))throw new Error("need speed by time i finish animation"+e);var t=n.defer(),o=n.defer(),r=i.defaultAnimationTime,s=i.nodeRadius,c=a.str("solved-level"),m=null,l=function(){(m=this.paper.text(this.paper.width/2,this.paper.height/2,c)).attr({opacity:0,"font-weight":500,"font-size":"32pt","font-family":"Monaco, Courier, font-monospace",stroke:"#000","stroke-width":2,fill:"#000"}),m.animate({opacity:1},r)}.bind(this);return t.promise.then(function(){return this.animateAllAttrKeys({exclude:["circle"]},{opacity:0},1.1*r/e)}.bind(this)).then(function(){return this.animateAllAttrKeys({exclude:["arrow","rect","path","text"]},{r:2*s},1.5*r/e)}.bind(this)).then(function(){return this.animateAllAttrKeys({exclude:["arrow","rect","path","text"]},{r:.75*s},.5*r/e)}.bind(this)).then(function(){return l(),this.explodeNodes(e)}.bind(this)).then(function(){return this.explodeNodes(e)}.bind(this)).then(function(){return this.animateAllAttrKeys({exclude:["arrow","rect","path","text"]},{},1.25*r)}.bind(this)).then(function(){return m.animate({opacity:0},r,void 0,void 0,(function(){m.remove()})),this.animateAllAttrKeys({},{})}.bind(this)).then((function(){o.resolve()})).fail((function(e){console.warn("animation error"+e)})).done(),t.resolve(),o.promise},g.prototype.explodeNodes=function(e){var t=n.defer(),o=[];Object.values(this.visNodeMap).forEach((function(t){o.push(t.getExplodeStepFunc(e))}));var a=setInterval((function(){var e=[];if(o.forEach((function(t){t()&&e.push(t)})),!e.length)return clearInterval(a),void t.resolve();o=e}),.025);return t.promise},g.prototype.animateAllFromAttrToAttr=function(e,t,o){var n=function(n){var a=n.getID();o.includes(a)||e[a]&&t[a]&&n.animateFromAttrToAttr(e[a],t[a])};this.visBranchCollection.each(n),this.visEdgeCollection.each(n),this.visTagCollection.each(n),Object.values(this.visNodeMap).forEach(n)},g.prototype.genSnapshot=function(){this.fullCalc();var e={};return Object.values(this.visNodeMap).forEach((function(t){e[t.get("id")]=t.getAttributes()}),this),this.visBranchCollection.each((function(t){e[t.getID()]=t.getAttributes()}),this),this.visEdgeCollection.each((function(t){e[t.getID()]=t.getAttributes()}),this),this.visTagCollection.each((function(t){e[t.getID()]=t.getAttributes()}),this),e},g.prototype.refreshTree=function(e){this.gitReady&&this.gitEngine.rootCommit&&(this.fullCalc(),this.animateAll(e))},g.prototype.refreshTreeHarsh=function(){this.fullCalc(),this.animateAll(0)},g.prototype.animateAll=function(e){this.zIndexReflow(),this.animateEdges(e),this.animateNodePositions(e),this.animateRefs(e)},g.prototype.fullCalc=function(){this.calcTreeCoords(),this.calcGraphicsCoords()},g.prototype.calcTreeCoords=function(){if(!this.rootCommit)throw new Error("grr, no root commit!");this.calcUpstreamSets(),this.calcBranchStacks(),this.calcTagStacks(),this.calcDepth(),this.calcWidth()},g.prototype.calcGraphicsCoords=function(){this.visBranchCollection.each((function(e){e.updateName()})),this.visTagCollection.each((function(e){e.updateName()}))},g.prototype.calcUpstreamSets=function(){this.upstreamBranchSet=this.gitEngine.getUpstreamBranchSet(),this.upstreamHeadSet=this.gitEngine.getUpstreamHeadSet(),this.upstreamTagSet=this.gitEngine.getUpstreamTagSet()},g.prototype.getCommitUpstreamBranches=function(e){return this.branchStackMap[e.get("id")]},g.prototype.getBlendedHuesForCommit=function(e){var t=this.upstreamBranchSet[e.get("id")];if(!t)throw new Error("that commit doesn't have upstream branches!");return this.blendHuesFromBranchStack(t)},g.prototype.blendHuesFromBranchStack=function(e){var t=[];return e.forEach((function(e){var o=e.obj.get("visBranch").get("fill");if("hsb"!==o.slice(0,3)){var n=Raphael.color(o);o=(o="hsb("+String(n.h)+","+String(n.l))+","+String(n.s)+")"}t.push(o)})),function(e){var t=0,o=0,n=0,a=0,i=e.length;e.forEach((function(e){var i=e.split("(")[1];i=(i=i.split(")")[0]).split(","),n+=parseFloat(i[1]),a+=parseFloat(i[2]);var r=parseFloat(i[0])*Math.PI*2;t+=Math.cos(r),o+=Math.sin(r)})),t/=i,o/=i,n/=i,a/=i;var r=Math.atan2(o,t)/(2*Math.PI);r<0&&(r+=1);return"hsb("+String(r)+","+String(n)+","+String(a)+")"}(t)},g.prototype.getCommitUpstreamStatus=function(e){if(!this.upstreamBranchSet)throw new Error("Can't calculate this yet!");var t=e.get("id"),o=this.upstreamBranchSet,n=this.upstreamHeadSet,a=this.upstreamTagSet;return o[t]?"branch":a[t]?"tag":n[t]?"head":"none"},g.prototype.calcTagStacks=function(){var e=this.gitEngine.getTags(),t={};e.forEach((function(e){var o=e.target.get("id");t[o]=t[o]||[],t[o].push(e),t[o].sort((function(e,t){var o=e.obj.get("id"),n=t.obj.get("id");return o.localeCompare(n)}))})),this.tagStackMap=t},g.prototype.calcBranchStacks=function(){var e=this.gitEngine.getBranches(),t={};e.forEach((function(e){var o=e.target.get("id");t[o]=t[o]||[],t[o].push(e),t[o].sort((function(e,t){var o=e.obj.get("id"),n=t.obj.get("id");return"master"==o||"master"==n?"master"==o?-1:1:o.localeCompare(n)}))})),this.branchStackMap=t},g.prototype.calcWidth=function(){this.maxWidthRecursive(this.rootCommit);var e=this.getPosBoundaries();this.assignBoundsRecursive(this.rootCommit,e.min,e.max)},g.prototype.maxWidthRecursive=function(e){var t=0;e.get("children").forEach((function(o){if(o.isMainParent(e)){var n=this.maxWidthRecursive(o);t+=n}}),this);var o=Math.max(1,t);return e.get("visNode").set("maxWidth",o),o},g.prototype.assignBoundsRecursive=function(e,t,o){var n=(o+t)/2;if(e.get("visNode").get("pos").x=n,0!==e.get("children").length){var a=o-t,i=0,r=e.get("children");r.forEach((function(t){t.isMainParent(e)&&(i+=t.get("visNode").getMaxWidthScaled())}),this);var s=t;r.forEach((function(t,o){if(t.isMainParent(e)){var n=t.get("visNode").getMaxWidthScaled()/i*a,r=s,c=r+n;this.assignBoundsRecursive(t,r,c),s=r+n}}),this)}},g.prototype.calcDepth=function(){var e=this.calcDepthRecursive(this.rootCommit,0);e>15&&console.warn("graphics are degrading from too many layers");var t=this.getDepthIncrement(e);Object.values(this.visNodeMap).forEach((function(e){e.setDepthBasedOn(t,this.getHeaderOffset())}),this)},g.prototype.animateNodePositions=function(e){Object.values(this.visNodeMap).forEach((function(t){t.animateUpdatedPosition(e)}),this)},g.prototype.addBranchFromEvent=function(e,t,o){var n=function(){this.addBranch(e)}.bind(this);this.gitEngine&&this.gitReady?n():this.defer(n)},g.prototype.addBranch=function(e){var t=new m({branch:e,gitVisuals:this,gitEngine:this.gitEngine});this.visBranchCollection.add(t),this.gitReady?t.genGraphics(this.paper):this.defer(function(){t.genGraphics(this.paper)}.bind(this))},g.prototype.addTagFromEvent=function(e,t,o){var n=function(){this.addTag(e)}.bind(this);this.gitEngine&&this.gitReady?n():this.defer(n)},g.prototype.removeTag=function(e,t,o){var n=function(){var t;this.visTagCollection.each((function(o){o.get("tag")==e&&(t=o)}),!0),t.remove(),this.removeVisTag(t)}.bind(this);this.gitEngine&&this.gitReady?n():this.defer(n)},g.prototype.addTag=function(e){var t=new u({tag:e,gitVisuals:this,gitEngine:this.gitEngine});this.visTagCollection.add(t),this.gitReady?t.genGraphics(this.paper):this.defer(function(){t.genGraphics(this.paper)}.bind(this))},g.prototype.removeVisBranch=function(e){this.visBranchCollection.remove(e)},g.prototype.removeVisTag=function(e){this.visTagCollection.remove(e)},g.prototype.removeVisNode=function(e){delete this.visNodeMap[e.getID()]},g.prototype.removeVisEdge=function(e){this.visEdgeCollection.remove(e)},g.prototype.animateRefs=function(e){this.visBranchCollection.each((function(t){t.animateUpdatedPos(e)}),this),this.visTagCollection.each((function(t){t.animateUpdatedPos(e)}),this)},g.prototype.animateEdges=function(e){this.visEdgeCollection.each((function(t){t.animateUpdatedPath(e)}),this)},g.prototype.getMinLayers=function(){return this.options.smallCanvas?2:7},g.prototype.getDepthIncrement=function(e){return e=Math.max(e,this.getMinLayers()),(1-this.getHeaderOffset())/e},g.prototype.shouldHaveHeader=function(){return this.gitEngine.isOrigin()||this.gitEngine.hasOrigin()},g.prototype.getHeaderOffset=function(){return this.shouldHaveHeader()?.05:0},g.prototype.calcDepthRecursive=function(e,t){e.get("visNode").setDepth(t);var o=e.get("children"),n=t;return o.forEach((function(e){var o=this.calcDepthRecursive(e,t+1);n=Math.max(o,n)}),this),n},g.prototype.canvasResize=function(e,t){this.resizeFunc||this.genResizeFunc(),this.resizeFunc(e,t)},g.prototype.genResizeFunc=function(){this.resizeFunc=r(function(e,t){this.refreshTree()}.bind(this),200,!0)},g.prototype.addNode=function(e,t){this.commitMap[e]=t,t.get("rootCommit")&&(this.rootCommit=t);var o=new c({id:e,commit:t,gitVisuals:this,gitEngine:this.gitEngine});return this.visNodeMap[e]=o,this.gitReady&&o.genGraphics(this.paper),o},g.prototype.addEdge=function(e,t){var o=this.visNodeMap[e],n=this.visNodeMap[t];if(!o||!n)throw new Error("one of the ids in ("+e+", "+t+") does not exist");var a=new h({tail:o,head:n,gitVisuals:this,gitEngine:this.gitEngine});this.visEdgeCollection.add(a),this.gitReady&&a.genGraphics(this.paper)},g.prototype.zIndexReflow=function(){this.visNodesFront(),this.visBranchesFront(),this.visTagsFront()},g.prototype.visNodesFront=function(){Object.values(this.visNodeMap).forEach((function(e){e.toFront()}))},g.prototype.visBranchesFront=function(){this.visBranchCollection.each((function(e){e.nonTextToFront(),e.textToFront()})),this.visBranchCollection.each((function(e){e.textToFrontIfInStack()}))},g.prototype.visTagsFront=function(){this.visTagCollection.each((function(e){e.nonTextToFront(),e.textToFront()})),this.visTagCollection.each((function(e){e.textToFrontIfInStack()}))},g.prototype.drawTreeFromReload=function(){this.gitReady=!0,this.deferFlush(),this.calcTreeCoords()},g.prototype.drawTreeFirstTime=function(){this.gitReady=!0,this.calcTreeCoords(),Object.values(this.visNodeMap).forEach((function(e){e.genGraphics(this.paper)}),this),this.visEdgeCollection.each((function(e){e.genGraphics(this.paper)}),this),this.visBranchCollection.each((function(e){e.genGraphics(this.paper)}),this),this.visTagCollection.each((function(e){e.genGraphics(this.paper)}),this),this.zIndexReflow()},o.GitVisuals=g},{"../app":44,"../intl":59,"../stores/GlobalStateStore":79,"../util/constants":82,"../util/debounce":83,"../visuals/visBranch":107,"../visuals/visEdge":108,"../visuals/visNode":109,"../visuals/visTag":110,q:19}],105:[function(e,t,o){var n=e("backbone").Model.extend({removeKeys:function(e){e.forEach((function(e){this.get(e)&&this.get(e).remove()}),this)},animateAttrKeys:function(e,t,o,n){e=Object.assign({},{include:["circle","arrow","rect","path","text"],exclude:[]},e||{});var a=this.getAttributes();e.include.forEach((function(e){a[e]=Object.assign({},a[e],t)})),e.exclude.forEach((function(e){delete a[e]})),this.animateToAttr(a,o,n)}});o.VisBase=n},{backbone:1}],106:[function(e,t,o){var n=e("backbone").Model.extend({removeKeys:function(e){e.forEach((function(e){this.get(e)&&this.get(e).remove()}),this)},getNonAnimateKeys:function(){return["stroke-dasharray"]},getIsInOrigin:function(){return!!this.get("gitEngine")&&this.get("gitEngine").isOrigin()},animateToAttr:function(e,t,o){if(0!==t){var n=void 0!==t?t:this.get("animationSpeed"),a=o||this.get("animationEasing");this.setAttr(e,!1,n,a)}else this.setAttr(e,!0)},setAttrBase:function(e,t,o,n,a){e.forEach((function(e){o?this.get(e).attr(t[e]):(this.get(e).stop(),this.get(e).animate(t[e],n,a),this.getNonAnimateKeys().forEach((function(o){t[e]&&void 0!==t[e][o]&&this.get(e).attr(o,t[e][o])}),this)),t.css&&$(this.get(e).node).css(t.css)}),this)},animateAttrKeys:function(e,t,o,n){e=Object.assign({},{include:["circle","arrow","rect","path","text"],exclude:[]},e||{});var a=this.getAttributes();e.include.forEach((function(e){a[e]=Object.assign({},a[e],t)})),e.exclude.forEach((function(e){delete a[e]})),this.animateToAttr(a,o,n)}});o.VisBase=n},{backbone:1}],107:[function(e,t,o){var n=e("backbone"),a=e("../util/constants").GRAPHICS,i=e("../visuals/visBase").VisBase,r=e("../graph/treeCompare"),s=function(){var e=Math.random();return"hsb("+String(e)+",0.6,1)"},c=i.extend({defaults:{pos:null,text:null,rect:null,arrow:null,isHead:!1,flip:1,fill:a.rectFill,stroke:a.rectStroke,"stroke-width":a.rectStrokeWidth,offsetX:4.75*a.nodeRadius,offsetY:0,arrowHeight:14,arrowInnerSkew:0,arrowEdgeHeight:6,arrowLength:14,arrowOffsetFromCircleX:10,vPad:5,hPad:5,animationSpeed:a.defaultAnimationTime,animationEasing:a.defaultEasing},validateAtInit:function(){if(!this.get("branch"))throw new Error("need a branch!")},getID:function(){return this.get("branch").get("id")},initialize:function(){if(this.validateAtInit(),this.gitVisuals=this.get("gitVisuals"),this.gitEngine=this.get("gitEngine"),!this.gitEngine)throw new Error("asd wtf");this.get("branch").set("visBranch",this);var e=this.get("branch").get("id");"HEAD"==e?(this.set("isHead",!0),this.set("flip",-1),this.refreshOffset(),this.set("fill",a.headRectFill)):"master"!==e&&this.set("fill",s())},getCommitPosition:function(){var e=this.gitEngine.getCommitFromRef(this.get("branch")),t=e.get("visNode");return this.set("flip",this.getFlipValue(e,t)),this.refreshOffset(),t.getScreenCoords()},getDashArray:function(){return this.get("gitVisuals").getIsGoalVis()?this.getIsLevelBranchCompared()?"":"--":""},getIsGoalAndNotCompared:function(){return!!this.get("gitVisuals").getIsGoalVis()&&!this.getIsLevelBranchCompared()},getIsLevelBranchCompared:function(){if(this.getIsMaster())return!0;var e=this.get("gitVisuals").getLevelBlob();return!r.onlyMasterCompared(e)},getIsMaster:function(){return"master"==this.get("branch").get("id")},getFlipValue:function(e,t){var o=this.get("gitVisuals").getFlipPos(),n=t.get("pos").x>o;return"C0"===e.get("id")?-1:this.get("isHead")?n?this.isBranchStackEmpty()?-1:1:this.isBranchStackEmpty()?1:-1:n?-1:1},refreshOffset:function(){var e=4.75*a.nodeRadius;1===this.get("flip")?(this.set("offsetY",-33),this.set("offsetX",e-10)):(this.set("offsetY",33),this.set("offsetX",e-10))},getArrowTransform:function(){return 1===this.get("flip")?"t-2,-20R-35":"t2,20R-35"},getBranchStackIndex:function(){if(this.get("isHead"))return 0;var e=this.getBranchStackArray(),t=-1;return e.forEach((function(e,o){e.obj==this.get("branch")&&(t=o)}),this),t},getBranchStackLength:function(){return this.get("isHead")?1:this.getBranchStackArray().length},isBranchStackEmpty:function(){var e=this.gitVisuals.branchStackMap[this.getCommitID()];return!e||0===e.length},getCommitID:function(){var e=this.get("branch").get("target");return"branch"===e.get("type")&&(e=e.get("target")),e.get("id")},getBranchStackArray:function(){var e=this.gitVisuals.branchStackMap[this.getCommitID()];return void 0===e?(this.gitVisuals.calcBranchStacks(),this.getBranchStackArray()):e},getTextPosition:function(){var e=this.getCommitPosition(),t=this.getBranchStackIndex();return{x:e.x+this.get("flip")*this.get("offsetX"),y:e.y+t*a.multiBranchY+this.get("offsetY")}},getRectPosition:function(){var e=this.getTextPosition(),t=(this.get("flip"),this.getTextSize());return{x:e.x-.5*t.w-this.get("hPad"),y:e.y-.5*t.h-this.get("vPad")}},getArrowPath:function(){var e=function(e,t,o){return{x:e.x+t,y:e.y+o}},t=function(e){return String(Math.round(e.x))+","+String(Math.round(e.y))},o=this.get("flip"),n=e(this.getCommitPosition(),o*this.get("arrowOffsetFromCircleX"),0),a=e(n,o*this.get("arrowLength"),-this.get("arrowHeight")),i=e(n,o*this.get("arrowLength"),this.get("arrowHeight")),r=e(a,o*this.get("arrowInnerSkew"),this.get("arrowEdgeHeight")),s=e(i,o*this.get("arrowInnerSkew"),-this.get("arrowEdgeHeight")),c=e(r,49*o,0),m=e(s,49*o,0),l="";return l+="M"+t(c)+" ",[r,a,n,i,s,m].forEach((function(e){l+="L"+t(e)+" "}),this),l+="z"},getTextSize:function(){var e=function(e){return e.w||(e.w=75),e.h||(e.h=20),e},t=this.get("text").node;if(this.get("isHead")){var o=t.getBoundingClientRect();return e({w:o.width,h:o.height})}var n=0;return this.getBranchStackArray().forEach((function(e){n=Math.max(n,function(e){var t=e.get("text")?e.get("text").node:null;return null===t?0:t.getBoundingClientRect().width}(e.obj.get("visBranch")))})),e({w:n,h:t.clientHeight})},getSingleRectSize:function(){var e=this.getTextSize(),t=this.get("vPad"),o=this.get("hPad");return{w:e.w+2*t,h:e.h+2*o}},getRectSize:function(){var e=this.getTextSize(),t=this.get("vPad"),o=this.get("hPad"),n=this.getBranchStackLength();return{w:e.w+2*t,h:e.h*n*1.1+2*o}},getIsRemote:function(){return this.get("branch").getIsRemote()},getName:function(){var e=this.get("branch").getName(),t=this.get("branch")===this.gitEngine.HEAD.get("target"),o=this.getIsRemote(),n=this.gitEngine.getIsHg();return"HEAD"===e&&n&&(e="."),e+(!t||this.getIsInOrigin()||o?"":"*")},nonTextToFront:function(){this.get("arrow").toFront(),this.get("rect").toFront()},textToFront:function(){this.get("text").toFront()},textToFrontIfInStack:function(){0!==this.getBranchStackIndex()&&this.get("text").toFront()},getFill:function(){return this.get("isHead")||1==this.getBranchStackLength()||0!==this.getBranchStackIndex()?this.get("fill"):this.gitVisuals.blendHuesFromBranchStack(this.getBranchStackArray())},remove:function(){this.removeKeys(["text","arrow","rect"]),this.gitVisuals.removeVisBranch(this)},handleModeChange:function(){},genGraphics:function(e){var t=this.getTextPosition(),o=this.getName(),n=e.text(t.x,t.y,String(o));n.attr({"font-size":14,"font-family":"Monaco, Courier, font-monospace",opacity:this.getTextOpacity()}),this.set("text",n);var a=this.getAttributes(),i=this.getRectPosition(),r=this.getRectSize(),s=e.rect(i.x,i.y,r.w,r.h,8).attr(a.rect);this.set("rect",s);var c=this.getArrowPath(),m=e.path(c).attr(a.arrow);this.set("arrow",m);["text","rect","arrow"].forEach((function(e){$(this.get(e).node).css(a.css)}),this),this.attachClickHandlers(),s.toFront(),n.toFront()},attachClickHandlers:function(){this.get("gitVisuals").options.noClick||[this.get("rect"),this.get("text"),this.get("arrow")].forEach((function(e){e.click(this.onClick.bind(this))}),this)},shouldDisableClick:function(){return this.get("isHead")&&!this.gitEngine.getDetachedHead()},onClick:function(){if(!this.shouldDisableClick()){var t="git checkout "+this.get("branch").get("id");e("../app").getEventBaton().trigger("commandSubmitted",t)}},updateName:function(){this.get("text").attr({text:this.getName()})},getNonTextOpacity:function(){return this.get("isHead")?this.gitEngine.getDetachedHead()?1:0:0!==this.getBranchStackIndex()?0:1},getTextOpacity:function(){return this.get("isHead")?this.gitEngine.getDetachedHead()?1:0:this.getIsGoalAndNotCompared()?0===this.getBranchStackIndex()?.7:.3:1},getStrokeWidth:function(){return this.getIsGoalAndNotCompared()?this.get("stroke-width")/5:this.get("stroke-width")},getAttributes:function(){var e=this.getTextOpacity();this.updateName();var t=this.getTextPosition(),o=this.getRectPosition(),n=this.getRectSize(),a=this.getArrowPath(),i=this.getDashArray();return{css:{cursor:this.shouldDisableClick()?"auto":"pointer"},text:{x:t.x,y:t.y,opacity:e},rect:{x:o.x,y:o.y,width:n.w,height:n.h,opacity:this.getNonTextOpacity(),fill:this.getFill(),stroke:this.get("stroke"),"stroke-dasharray":i,"stroke-width":this.getStrokeWidth()},arrow:{path:a,opacity:this.getNonTextOpacity(),fill:this.getFill(),stroke:this.get("stroke"),transform:this.getArrowTransform(),"stroke-dasharray":i,"stroke-width":this.getStrokeWidth()}}},animateUpdatedPos:function(e,t){var o=this.getAttributes();this.animateToAttr(o,e,t)},animateFromAttrToAttr:function(e,t,o,n){this.animateToAttr(e,0),this.animateToAttr(t,o,n)},setAttr:function(e,t,o,n){this.setAttrBase(["text","rect","arrow"],e,t,o,n)}}),m=n.Collection.extend({model:c});o.VisBranchCollection=m,o.VisBranch=c,o.randomHueString=s},{"../app":44,"../graph/treeCompare":57,"../util/constants":82,"../visuals/visBase":106,backbone:1}],108:[function(e,t,o){var n=e("backbone"),a=e("../util/constants").GRAPHICS,i=e("../visuals/visBase").VisBase,r=e("../stores/GlobalStateStore"),s=i.extend({defaults:{tail:null,head:null,animationSpeed:a.defaultAnimationTime,animationEasing:a.defaultEasing},validateAtInit:function(){["tail","head"].forEach((function(e){if(!this.get(e))throw new Error(e+" is required!")}),this)},getID:function(){return this.get("tail").get("id")+"."+this.get("head").get("id")},initialize:function(){this.validateAtInit(),this.gitVisuals=this.get("gitVisuals"),this.gitEngine=this.get("gitEngine"),this.get("tail").get("outgoingEdges").push(this)},remove:function(){this.removeKeys(["path"]),this.gitVisuals.removeVisEdge(this)},genSmoothBezierPathString:function(e,t){var o=e.getScreenCoords(),n=t.getScreenCoords();return this.genSmoothBezierPathStringFromCoords(o,n)},genSmoothBezierPathStringFromCoords:function(e,t){var o=r.getFlipTreeY()?-1:1,n=function(e){return String(Math.round(e.x))+","+String(Math.round(e.y))},i=function(e,t,n){return n=n||a.curveControlPointOffset,{x:e.x,y:e.y+o*n*t}},s=function(e,t,n){return{x:e.x+t,y:e.y+o*n}};e=i(e,-1,this.get("tail").getRadius()),t=i(t,1,1.15*this.get("head").getRadius());var c="";c+="M"+n(e)+" ",c+="C",c+=n(i(e,-1))+" ",c+=n(i(t,1))+" ",c+=n(t);var m=a.arrowHeadSize||10;return c+=" L"+n(s(t,-m,m)),c+=" L"+n(s(t,m,m)),c+=" L"+n(t),c+="C",c+=n(i(t,1))+" ",c+=n(i(e,-1))+" ",c+=n(e)},getBezierCurve:function(){return this.genSmoothBezierPathString(this.get("tail"),this.get("head"))},getStrokeColor:function(){return a.visBranchStrokeColorNone},setOpacity:function(e){e=void 0===e?1:e,this.get("path").attr({opacity:e})},genGraphics:function(e){var t=this.getBezierCurve(),o=e.path(t).attr({"stroke-width":a.visBranchStrokeWidth,stroke:this.getStrokeColor(),"stroke-linecap":"round","stroke-linejoin":"round",fill:this.getStrokeColor()});o.toBack(),this.set("path",o)},getOpacity:function(){var e=this.gitVisuals.getCommitUpstreamStatus(this.get("tail")),t={branch:1,tag:1,head:a.edgeUpstreamHeadOpacity,none:a.edgeUpstreamNoneOpacity};if(void 0===t[e])throw new Error("bad stat");return t[e]},getAttributes:function(){return{path:{path:this.getBezierCurve(),opacity:this.getOpacity()}}},animateUpdatedPath:function(e,t){var o=this.getAttributes();this.animateToAttr(o,e,t)},animateFromAttrToAttr:function(e,t,o,n){this.animateToAttr(e,0),this.animateToAttr(t,o,n)},animateToAttr:function(e,t,o){0!==t?(this.get("path").toBack(),this.get("path").stop(),this.get("path").animate(e.path,void 0!==t?t:this.get("animationSpeed"),o||this.get("animationEasing"))):this.get("path").attr(e.path)}}),c=n.Collection.extend({model:s});o.VisEdgeCollection=c,o.VisEdge=s},{"../stores/GlobalStateStore":79,"../util/constants":82,"../visuals/visBase":106,backbone:1}],109:[function(e,t,o){e("backbone");var n=e("../util/constants").GRAPHICS,a=e("../visuals/visBase").VisBase,i=a.extend({defaults:{depth:void 0,maxWidth:null,outgoingEdges:null,circle:null,text:null,id:null,pos:null,radius:null,commit:null,animationSpeed:n.defaultAnimationTime,animationEasing:n.defaultEasing,fill:n.defaultNodeFill,"stroke-width":n.defaultNodeStrokeWidth,stroke:n.defaultNodeStroke},getID:function(){return this.get("id")},validateAtInit:function(){if(!this.get("id"))throw new Error("need id for mapping");if(!this.get("commit"))throw new Error("need commit for linking");this.get("pos")||this.set("pos",{x:Math.random(),y:Math.random()})},initialize:function(){this.validateAtInit(),this.gitVisuals=this.get("gitVisuals"),this.gitEngine=this.get("gitEngine"),this.set("outgoingEdges",[])},setDepth:function(e){this.set("depth",Math.max(this.get("depth")||0,e))},setDepthBasedOn:function(e,t){if(void 0===this.get("depth"))throw new Error("no depth yet!");this.get("pos").y=this.get("depth")*e+t},getMaxWidthScaled:function(){var e=this.gitVisuals.getCommitUpstreamStatus(this.get("commit")),t={branch:1,tag:1,head:.3,none:.1};if(void 0===t[e])throw new Error("bad stat");return t[e]*this.get("maxWidth")},toFront:function(){this.get("circle").toFront(),this.get("text").toFront()},getOpacity:function(){var e={branch:1,tag:1,head:n.upstreamHeadOpacity,none:n.upstreamNoneOpacity},t=this.gitVisuals.getCommitUpstreamStatus(this.get("commit"));if(void 0===e[t])throw new Error("invalid status");return e[t]},getTextScreenCoords:function(){return this.getScreenCoords()},getAttributes:function(){var e=this.getScreenCoords(),t=this.getTextScreenCoords(),o=this.getOpacity(),a=this.getIsInOrigin()?n.originDash:"";return{circle:{cx:e.x,cy:e.y,opacity:o,r:this.getRadius(),fill:this.getFill(),"stroke-width":this.get("stroke-width"),"stroke-dasharray":a,stroke:this.get("stroke")},text:{x:t.x,y:t.y,opacity:o}}},animatePositionTo:function(e,t,o){var n=this.getAttributes(),a=e.getAttributes();n.circle=a.circle,n.text=a.text,this.animateToAttr(n,t,o)},highlightTo:function(e,t,o){var n=e.get("fill"),a={circle:{fill:n,stroke:n,"stroke-dasharray":"","stroke-width":5*this.get("stroke-width")},text:{}};this.animateToAttr(a,t,o)},animateUpdatedPosition:function(e,t){var o=this.getAttributes();this.animateToAttr(o,e,t)},animateFromAttrToAttr:function(e,t,o,n){this.animateToAttr(e,0),this.animateToAttr(t,o,n)},animateToSnapshot:function(e,t,o){e[this.getID()]&&this.animateToAttr(e[this.getID()],t,o)},setAttr:function(e,t,o,n){this.setAttrBase(["text","circle"],e,t,o,n)},animateToAttr:function(e,t,o){a.prototype.animateToAttr.apply(this,arguments);var n=void 0!==t?t:this.get("animationSpeed");o||this.get("animationEasing");"bounce"==o&&e.circle&&void 0!==e.circle.cx&&e.text&&void 0!==e.text.x&&(this.get("circle").animate(e.circle.cx,n,"easeInOut"),this.get("text").animate(e.text.x,n,"easeInOut"))},getScreenCoords:function(){var e=this.get("pos");return this.gitVisuals.toScreenCoords(e)},getRadius:function(){return this.get("radius")||n.nodeRadius},getParentScreenCoords:function(){return this.get("commit").get("parents")[0].get("visNode").getScreenCoords()},setBirthPosition:function(){var e=this.getParentScreenCoords();this.get("circle").attr({cx:e.x,cy:e.y,opacity:0,r:0}),this.get("text").attr({x:e.x,y:e.y,opacity:0})},setBirthFromSnapshot:function(e){var t=e[this.get("commit").get("parents")[0].get("visNode").getID()];this.get("circle").attr({opacity:0,r:0,cx:t.circle.cx,cy:t.circle.cy}),this.get("text").attr({opacity:0,x:t.text.x,y:t.text.y});var o={x:t.circle.cx,y:t.circle.cy};this.setOutgoingEdgesBirthPosition(o)},setBirth:function(){this.setBirthPosition(),this.setOutgoingEdgesBirthPosition(this.getParentScreenCoords())},setOutgoingEdgesOpacity:function(e){this.get("outgoingEdges").forEach((function(t){t.setOpacity(e)}))},animateOutgoingEdgesToAttr:function(e,t,o){this.get("outgoingEdges").forEach((function(t){var o=e[t.getID()];t.animateToAttr(o)}),this)},animateOutgoingEdges:function(e,t){this.get("outgoingEdges").forEach((function(o){o.animateUpdatedPath(e,t)}),this)},animateOutgoingEdgesFromSnapshot:function(e,t,o){this.get("outgoingEdges").forEach((function(n){var a=e[n.getID()];n.animateToAttr(a,t,o)}),this)},setOutgoingEdgesBirthPosition:function(e){this.get("outgoingEdges").forEach((function(t){var o=t.get("head").getScreenCoords(),n=t.genSmoothBezierPathStringFromCoords(e,o);t.get("path").stop(),t.get("path").attr({path:n,opacity:0})}),this)},parentInFront:function(){this.get("commit").get("parents")[0].get("visNode").toFront()},getFontSize:function(e){return e.length<3?12:e.length<5?10:8},getFill:function(){var e=this.gitVisuals.getCommitUpstreamStatus(this.get("commit"));return"head"==e?n.headRectFill:"tag"==e||"none"==e?n.orphanNodeFill:this.gitVisuals.getBlendedHuesForCommit(this.get("commit"))},attachClickHandlers:function(){if(!this.get("gitVisuals").options.noClick){var t="git checkout "+this.get("commit").get("id"),o=e("../app");[this.get("circle"),this.get("text")].forEach((function(e){e.click((function(){o.getEventBaton().trigger("commandSubmitted",t)})),$(e.node).css("cursor","pointer")}))}},setOpacity:function(e){e=void 0===e?1:e;["circle","text"].forEach((function(t){this.get(t).attr({opacity:e})}),this)},remove:function(){this.removeKeys(["circle"],["text"]);var e=this.get("text");e&&e.remove(),this.gitVisuals.removeVisNode(this)},removeAll:function(){this.remove(),this.removeAllEdges()},removeAllEdges:function(){this.get("outgoingEdges").forEach((function(e){e.remove()}),this)},getExplodeStepFunc:function(e){if(!e)throw new Error("need speed by now");var t=this.get("circle"),o=20/e,n=Math.PI+1*Math.random()*Math.PI,a=.2*e,i=.01*e,r=o*Math.cos(n),s=o*Math.sin(n),c=t.attr("cx"),m=t.attr("cy"),l=this.gitVisuals.paper.width,u=this.gitVisuals.paper.height,d=.8/e;return function(){return((c+=1*(r-=i*r))<0||c>l)&&(r=d*-r,c=c<0?0:l),((m+=1*(s+=1*a-i*s))<0||m>u)&&(s=d*-s,m=m<0?0:u),t.attr({cx:c,cy:m}),!(r*r+s*s<.1&&Math.abs(m-u)<=.1)}},makeCircle:function(e){var t=this.getScreenCoords();return e.circle(t.x,t.y,this.getRadius()).attr(this.getAttributes().circle)},makeText:function(e){var t=this.getTextScreenCoords();return e.text(t.x,t.y,String(this.get("id")))},genGraphics:function(){var e=this.gitVisuals.paper,t=this.makeCircle(e),o=this.makeText(e);o.attr({"font-size":this.getFontSize(this.get("id")),"font-weight":"bold","font-family":"Monaco, Courier, font-monospace",opacity:this.getOpacity()}),this.set("circle",t),this.set("text",o),this.attachClickHandlers()}});o.VisNode=i},{"../app":44,"../util/constants":82,"../visuals/visBase":106,backbone:1}],110:[function(e,t,o){var n=e("backbone"),a=e("../util/constants").GRAPHICS,i=e("../visuals/visBase").VisBase,r=e("../graph/treeCompare"),s=i.extend({defaults:{pos:null,text:null,rect:null,isHead:!1,fill:a.tagFill,stroke:a.tagStroke,"stroke-width":a.tagStrokeWidth,offsetX:a.nodeRadius,offsetY:a.nodeRadius,vPad:2,hPad:2,animationSpeed:a.defaultAnimationTime,animationEasing:a.defaultEasing},validateAtInit:function(){if(!this.get("tag"))throw new Error("need a Tag!")},getID:function(){return this.get("tag").get("id")},initialize:function(){if(this.validateAtInit(),this.gitVisuals=this.get("gitVisuals"),this.gitEngine=this.get("gitEngine"),!this.gitEngine)throw new Error("asd wtf");this.get("tag").set("visTag",this)},getCommitPosition:function(){return this.gitEngine.getCommitFromRef(this.get("tag")).get("visNode").getScreenCoords()},getDashArray:function(){return this.get("gitVisuals").getIsGoalVis()?this.getIsLevelTagCompared()?"":"--":""},getIsGoalAndNotCompared:function(){return!!this.get("gitVisuals").getIsGoalVis()&&!this.getIsLevelTagCompared()},getIsLevelTagCompared:function(){var e=this.get("gitVisuals").getLevelBlob();return!r.onlyMasterCompared(e)},getTagStackIndex:function(){if(this.get("isHead"))return 0;var e=this.getTagStackArray(),t=-1;return e.forEach((function(e,o){e.obj==this.get("tag")&&(t=o)}),this),t},getTagStackLength:function(){return this.get("isHead")?1:this.getTagStackArray().length},isTagStackEmpty:function(){var e=this.gitVisuals.tagStackMap[this.getCommitID()];return!e||0===e.length},getCommitID:function(){return this.get("tag").get("target").get("id")},getTagStackArray:function(){var e=this.gitVisuals.tagStackMap[this.getCommitID()];return void 0===e?(this.gitVisuals.calcTagStacks(),this.getTagStackArray()):e},getTextPosition:function(){var e=this.getCommitPosition(),t=this.getTagStackIndex();return{x:e.x+this.get("offsetX"),y:e.y+t*a.multiTagY+this.get("offsetY")}},getRectPosition:function(){var e=this.getTextPosition(),t=this.getTextSize();return{x:e.x-this.get("hPad"),y:e.y-.5*t.h-this.get("vPad")}},getTextSize:function(){var e,t=this.get("text").node,o=0;return this.getTagStackArray().forEach((function(e){o=Math.max(o,function(e){var t=e.get("text")?e.get("text").node:null;return null===t?0:t.getBoundingClientRect().width}(e.obj.get("visTag")))})),(e={w:o,h:t.clientHeight}).w||(e.w=75),e.h||(e.h=20),e},getSingleRectSize:function(){var e=this.getTextSize(),t=this.get("vPad"),o=this.get("hPad");return{w:e.w+2*t,h:e.h+2*o}},getRectSize:function(){var e=this.getTextSize(),t=this.get("vPad"),o=this.get("hPad"),n=this.getTagStackLength();return{w:e.w+2*t,h:e.h*n+2*o}},getIsRemote:function(){return this.get("tag").getIsRemote()},getName:function(){var e=this.get("tag").getName();this.getIsRemote(),this.gitEngine.getIsHg();return e},nonTextToFront:function(){this.get("rect").toFront()},textToFront:function(){this.get("text").toFront()},textToFrontIfInStack:function(){0!==this.getTagStackIndex()&&this.get("text").toFront()},remove:function(){this.removeKeys(["text","rect"]),this.gitVisuals.removeVisTag(this)},handleModeChange:function(){},genGraphics:function(e){var t=this.getTextPosition(),o=this.getName(),n=e.text(t.x,t.y,String(o));n.attr({"font-size":14,"font-family":"Monaco, Courier, font-monospace",opacity:this.getTextOpacity(),"text-anchor":"start"}),this.set("text",n);var a=this.getAttributes(),i=this.getRectPosition(),r=this.getRectSize(),s=e.rect(i.x,i.y,r.w,r.h,8).attr(a.rect);this.set("rect",s);["text","rect"].forEach((function(e){$(this.get(e).node).css(a.css)}),this),this.attachClickHandlers(),s.toFront(),n.toFront()},attachClickHandlers:function(){this.get("gitVisuals").options.noClick||[this.get("rect"),this.get("text")].forEach((function(e){e.click(this.onClick.bind(this))}),this)},shouldDisableClick:function(){return this.get("isHead")&&!this.gitEngine.getDetachedHead()},onClick:function(){if(!this.shouldDisableClick()){var t="git checkout "+this.get("tag").get("id");e("../app").getEventBaton().trigger("commandSubmitted",t)}},updateName:function(){this.get("text").attr({text:this.getName()})},getNonTextOpacity:function(){return this.get("isHead")?this.gitEngine.getDetachedHead()?1:0:0!==this.getTagStackIndex()?0:1},getTextOpacity:function(){return this.get("isHead")?this.gitEngine.getDetachedHead()?1:0:this.getIsGoalAndNotCompared()?0===this.getTagStackIndex()?.7:.3:1},getStrokeWidth:function(){return this.getIsGoalAndNotCompared()?this.get("stroke-width")/5:this.get("stroke-width")},getAttributes:function(){var e=this.getTextOpacity();this.updateName();var t=this.getTextPosition(),o=this.getRectPosition(),n=this.getRectSize(),a=this.getDashArray();return{css:{cursor:this.shouldDisableClick()?"auto":"pointer"},text:{x:t.x,y:t.y,opacity:e},rect:{x:o.x,y:o.y,width:n.w,height:n.h,opacity:this.getNonTextOpacity(),fill:this.get("fill"),stroke:this.get("stroke"),"stroke-dasharray":a,"stroke-width":this.getStrokeWidth()}}},animateUpdatedPos:function(e,t){var o=this.getAttributes();this.animateToAttr(o,e,t)},animateFromAttrToAttr:function(e,t,o,n){this.animateToAttr(e,0),this.animateToAttr(t,o,n)},setAttr:function(e,t,o,n){this.setAttrBase(["text","rect"],e,t,o,n)}}),c=n.Collection.extend({model:s});o.VisTagCollection=c,o.VisTag=s,o.randomHueString=function(){var e=Math.random();return"hsb("+String(e)+",0.7,1)"}},{"../app":44,"../graph/treeCompare":57,"../util/constants":82,"../visuals/visBase":106,backbone:1}],111:[function(e,t,o){(function(t){var n=e("backbone"),a=e("../models/collections"),i=a.CommitCollection,r=a.BranchCollection,s=a.TagCollection,c=e("../util/eventBaton").EventBaton,m=e("../visuals").GitVisuals,l=n.View.extend({initialize:function(e){e=e||{},this.options=e,this.customEvents=Object.assign({},n.Events),this.containerElement=e.containerElement;var o=this,a=e.containerElement||$("#canvasHolder")[0];new Raphael(a,200,200,(function(){var n=this;t.nextTick((function(){o.paperInitialize(n,e)}))}))},paperInitialize:function(o,n){this.treeString=n.treeString,this.paper=o;var a=e("../app");this.eventBaton=n.noKeyboardInput?new c({noInput:!0}):a.getEventBaton(),this.commitCollection=new i,this.branchCollection=new r,this.tagCollection=new s,this.gitVisuals=new m({commitCollection:this.commitCollection,branchCollection:this.branchCollection,tagCollection:this.tagCollection,paper:this.paper,noClick:this.options.noClick,isGoalVis:this.options.isGoalVis,smallCanvas:this.options.smallCanvas,visualization:this});var l=e("../git").GitEngine;this.gitEngine=new l({collection:this.commitCollection,branches:this.branchCollection,tags:this.tagCollection,gitVisuals:this.gitVisuals,eventBaton:this.eventBaton}),this.gitEngine.init(),this.gitVisuals.assignGitEngine(this.gitEngine),this.myResize(),$(window).on("resize",()=>this.myResize()),this.$el.parents(".ui-draggable").on("drag",function(e,t){this.customEvents.trigger("drag",e,t),this.myResize()}.bind(this)),this.gitVisuals.drawTreeFirstTime(),this.treeString&&this.gitEngine.loadTreeFromString(this.treeString),this.options.zIndex&&this.setTreeIndex(this.options.zIndex),this.shown=!1,this.setTreeOpacity(0),t.nextTick(this.fadeTreeIn.bind(this)),this.customEvents.trigger("gitEngineReady"),this.customEvents.trigger("paperReady")},clearOrigin:function(){delete this.originVis},makeOrigin:function(e){return this.originVis=new l(Object.assign({},this.options,{noKeyboardInput:!0,noClick:!0,treeString:e.treeString})),this.originVis.customEvents.on("paperReady",function(){var e=$(this.paper.canvas).css("z-index");this.originVis.setTreeIndex(e)}.bind(this)),this.originVis},originToo:function(e,t){if(this.originVis){var o=function(){this.originVis[e].apply(this.originVis,t)}.bind(this);this.originVis.paper?o():this.originVis.customEvents.on("paperReady",o)}},setTreeIndex:function(e){$(this.paper.canvas).css("z-index",e),this.originToo("setTreeIndex",arguments)},setTreeOpacity:function(e){0===e&&(this.shown=!1),$(this.paper.canvas).css("opacity",e),this.originToo("setTreeOpacity",arguments)},getAnimationTime:function(){return 300},fadeTreeIn:function(){this.shown=!0,this.paper&&($(this.paper.canvas).animate({opacity:1},this.getAnimationTime()),this.originToo("fadeTreeIn",arguments))},fadeTreeOut:function(){this.shown=!1,this.paper&&this.paper.canvas&&$(this.paper.canvas).animate({opacity:0},this.getAnimationTime()),this.originToo("fadeTreeOut",arguments)},hide:function(){this.fadeTreeOut(),setTimeout(function(){$(this.paper.canvas).css("visibility","hidden")}.bind(this),this.getAnimationTime()),this.originToo("hide",arguments)},show:function(){$(this.paper.canvas).css("visibility","visible"),setTimeout(this.fadeTreeIn.bind(this),10),this.originToo("show",arguments),this.myResize()},showHarsh:function(){$(this.paper.canvas).css("visibility","visible"),this.setTreeOpacity(1),this.originToo("showHarsh",arguments),this.myResize()},resetFromThisTreeNow:function(e){this.treeString=e;var t=this.getOriginInTreeString(e);if(t){var o=this.gitEngine.printTree(t);this.originToo("resetFromThisTreeNow",[o])}},getOriginInTreeString:function(e){return JSON.parse(unescape(e)).originTree},reset:function(e){var t=e||this.treeString;if(this.setTreeOpacity(0),t?this.gitEngine.loadTreeFromString(t):this.gitEngine.defaultInit(),this.fadeTreeIn(),this.originVis)if(t){var o=this.getOriginInTreeString(t);this.originToo("reset",[JSON.stringify(o)])}else this.originToo("reset",arguments)},tearDown:function(e){e=e||{},this.gitEngine.tearDown(),this.gitVisuals.tearDown(),delete this.paper,this.originToo("tearDown",arguments)},die:function(){this.fadeTreeOut(),setTimeout(function(){this.shown||this.tearDown({fromDie:!0})}.bind(this),this.getAnimationTime()),this.originToo("die",arguments)},myResize:function(){if(this.paper){var e=this.el,t=e.getBoundingClientRect(),o=t.width,n=t.height;if(this.containerElement)$(this.paper.canvas).css({position:"absolute"});else{var a=this.$el.offset().left,i=this.$el.offset().top;$(this.paper.canvas).css({position:"absolute",left:a+"px",top:i+"px"})}this.paper.setSize(o,n),this.gitVisuals.canvasResize(o,n),this.originToo("myResize",arguments)}}});o.Visualization=l}).call(this,e("_process"))},{"../app":44,"../git":55,"../models/collections":67,"../util/eventBaton":87,"../visuals":104,_process:13,backbone:1}],112:[function(e,t,o){o.level={goalTreeString:'{"branches":{"master":{"target":"C7","id":"master"},"bugWork":{"target":"C2","id":"bugWork"}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"},"C2":{"parents":["C1"],"id":"C2"},"C3":{"parents":["C1"],"id":"C3"},"C4":{"parents":["C3"],"id":"C4"},"C5":{"parents":["C2"],"id":"C5"},"C6":{"parents":["C4","C5"],"id":"C6"},"C7":{"parents":["C6"],"id":"C7"}},"HEAD":{"target":"master","id":"HEAD"}}',solutionCommand:"git branch bugWork master^^2^",startTree:'{"branches":{"master":{"target":"C7","id":"master"}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"},"C2":{"parents":["C1"],"id":"C2"},"C3":{"parents":["C1"],"id":"C3"},"C4":{"parents":["C3"],"id":"C4"},"C5":{"parents":["C2"],"id":"C5"},"C6":{"parents":["C4","C5"],"id":"C6"},"C7":{"parents":["C6"],"id":"C7"}},"HEAD":{"target":"master","id":"HEAD"}}',name:{en_US:"Multiple parents",zh_CN:"两个父节点",fr_FR:"Parents multiples",de_DE:"Mehrere Vorgänger",ja:"複数の親",es_AR:"Múltiples padres",es_ES:"Múltiples padres",pt_BR:"Múltiplos pais",gl:"Múltiples pais",zh_TW:"多個 parent commit",ru_RU:"Здоровая семья, или несколько родителей",ko:"다수의 부모",uk:"Декілька батьків",vi:"Nhiều cha lắm mẹ"},hint:{en_US:"Use `git branch bugWork` with a target commit to create the missing reference.",de_DE:"Nutze `git branch bugWork` mit einem Ziel-Commit um die fehlende Referenz zu erstellen.",ja:"`git branch bugWork`を対象のコミットと組み合わせて使い、欠如しているリファレンスを作成しましょう",fr_FR:'Utilisez "git branch bugWork" avec un commit pour créer une référence manquante',zh_CN:"使用 `git branch bugWork` 加上一个目标提交记录来创建消失的引用。",es_AR:"Usá `git branch bugWork` sobre algún commit para crear la referencia faltante",es_ES:"Usa `git branch bugWork` sobre algún commit para crear la referencia que falta",pt_BR:"Use `git branch bugWork` com um commit alvo para criar a referência que falta",gl:"Usa `git branch bugWork` sobre calquera commit para crear a referencia que falta",zh_TW:"在一個指定的 commit 上面使用 `git branch bugWork`。",ru_RU:"`git branch bugWork` на нужном коммите поможет создать нужную ссылку.",ko:"`git branch bugWork`를 대상 커밋과 함께 사용해서 부족한 참조를 만드세요",uk:'Використай "git branch bugWork" на потрібному коміті щоб створити потрібне посилання',vi:"Dùng lệnh `git branch bugWork` để tạo nhánh tại vị trí chỉ định"},startDialog:{en_US:{childViews:[{type:"ModalAlert",options:{markdowns:["### Specifying Parents","","Like the `~` modifier, the `^` modifier also accepts an optional number after it.","","Rather than specifying the number of generations to go back (what `~` takes), the modifier on `^` specifies which parent reference to follow from a merge commit. Remember that merge commits have multiple parents, so the path to choose is ambiguous.","",'Git will normally follow the "first" parent upwards from a merge commit, but specifying a number with `^` changes this default behavior.',"","Enough talking, let's see it in action.",""]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Here we have a merge commit. If we checkout `master^` without the modifier, we will follow the first parent after the merge commit. ","","(*In our visuals, the first parent is positioned directly above the merge commit.*)"],afterMarkdowns:["Easy -- this is what we are all used to."],command:"git checkout master^",beforeCommand:"git checkout HEAD^; git commit; git checkout master; git merge C2"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Now let's try specifying the second parent instead..."],afterMarkdowns:["See? We followed the other parent upwards."],command:"git checkout master^2",beforeCommand:"git checkout HEAD^; git commit; git checkout master; git merge C2"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["The `^` and `~` modifiers can make moving around a commit tree very powerful:"],afterMarkdowns:["Lightning fast!"],command:"git checkout HEAD~; git checkout HEAD^2; git checkout HEAD~2",beforeCommand:"git commit; git checkout C0; git commit; git commit; git commit; git checkout master; git merge C5; git commit"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Even crazier, these modifiers can be chained together! Check this out:"],afterMarkdowns:["The same movement as before, but all in one command."],command:"git checkout HEAD~^2~2",beforeCommand:"git commit; git checkout C0; git commit; git commit; git commit; git checkout master; git merge C5; git commit"}},{type:"ModalAlert",options:{markdowns:["### Put it to practice","","To complete this level, create a new branch at the specified destination.","","Obviously it would be easy to specify the commit directly (with something like `C6`), but I challenge you to use the modifiers we talked about instead!"]}}]},de_DE:{childViews:[{type:"ModalAlert",options:{markdowns:["### Vorgänger ansteuern","","Wie der Operator `~` akzeptiert auch der Operator `^` eine optionale Anzahl.","","Anstatt der Anzahl von Schritten, die zurückgegangen werden soll (das ist das, was man bei `~` angibt), bezeichnet die Anzahl nach `^` welchem Vorgänger bei einem Merge-Commit gefolgt werden soll. Du erinnerst dich, dass ein Merge-Commit mehrere Vorgänger hat; es gilt also aus diesen auszuwählen.","",'Normalerweise folgt Git dem "ersten" Vorgänger des Merge-Commit, aber durch Angabe einer Zahl nach dem `^` lässt sich dieses Verhalten ändern.',"","Aber genug gequatscht, schauen wir's uns in Aktion an.",""]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Hier sehen wir einen Merge-Commit. Wenn wir einen Checkout von `master^` ohne Zahl machen, wird Git auf den ersten Vorgänger des Commits zurückgehen. ","","*(In unserer Darstellung befindet sich der erste Vorgänger direkt über dem Merge-Commit.)*"],afterMarkdowns:["Simpel -- so kennen wir das."],command:"git checkout master^",beforeCommand:"git checkout HEAD^; git commit; git checkout master; git merge C2"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Jetzt versuchen wir mal stattdessen den zweiten Vorgänger anzugeben ..."],afterMarkdowns:["Gesehen? Wir gehen zu dem anderen Vorgänger zurück."],command:"git checkout master^2",beforeCommand:"git checkout HEAD^; git commit; git checkout master; git merge C2"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Die Operatoren `^` und `~` geben uns eine Menge Möglichkeiten für das Navigieren durch den Commit-Baum:"],afterMarkdowns:["Bämm!"],command:"git checkout HEAD~; git checkout HEAD^2; git checkout HEAD~2",beforeCommand:"git commit; git checkout C0; git commit; git commit; git commit; git checkout master; git merge C5; git commit"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Noch abgefahrener: die beiden Operatoren können verkettet werden. Aufgepasst:"],afterMarkdowns:["Gleicher Ablauf wie zuvor, nur alles in einem Befehl."],command:"git checkout HEAD~^2~2",beforeCommand:"git commit; git checkout C0; git commit; git commit; git commit; git checkout master; git merge C5; git commit"}},{type:"ModalAlert",options:{markdowns:["### Setzen wir's um","","Erstelle einen neuen Branch an dem angegebenen Ziel, um diesen Level abzuschließen.","","Es ist natürlich möglich den Commit einfach direkt anzugeben (also mit sowas wie `C6`), aber ich fordere dich heraus stattdessen die relativen Operatoren zu benutzen!"]}}]},fr_FR:{childViews:[{type:"ModalAlert",options:{markdowns:["### Détermine les parents","","Comme le symbole `~`, le symbole `^` accepte un numéro après lui.","","Au lieu d'entrer le nombre de générations à remonter (ce que `~` fait), le symbole `^` détermine quel parent est à remonter. Attention, un merge commit a deux parents ce qui peut porter à confusion.","",'Normalement Git suit le "premier" parent pour un commit/merge, mais avec un numéro suivi de `^` le comportement par défaut est modifié.',"","Assez de bla bla, passons à l'action",""]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Nous avons un commit/merge. Si nous faisons checkout `master^` sans le symbole, on obtient le premier parent suivant ce commit. ","","(*Dans notre vue, le premier parent se situe juste au dessus du merge.*)"],afterMarkdowns:["Facile -- C'est ce que nous faisons tout le temps."],command:"git checkout master^",beforeCommand:"git checkout HEAD^; git commit; git checkout master; git merge C2"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Nous allons spécifier le deuxième parent à la place."],afterMarkdowns:["Vous voyez ? Nous suivons le second parent."],command:"git checkout master^2",beforeCommand:"git checkout HEAD^; git commit; git checkout master; git merge C2"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Les symboles `^` et `~` permettent de se déplacer de façon très efficace :"],afterMarkdowns:["Boum, vitesse du tonnerre !"],command:"git checkout HEAD~; git checkout HEAD^2; git checkout HEAD~2",beforeCommand:"git commit; git checkout C0; git commit; git commit; git commit; git checkout master; git merge C5; git commit"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Encore plus fou, ces symboles peuvent être enchainés ! Regardez cela :"],afterMarkdowns:["Le même résultat, mais en une seule commande."],command:"git checkout HEAD~^2~2",beforeCommand:"git commit; git checkout C0; git commit; git commit; git commit; git checkout master; git merge C5; git commit"}},{type:"ModalAlert",options:{markdowns:["### Un peu de pratique","","Pour réussir le niveau, créez une nouvelle branche à la destination indiquée.","","Évidement ce serait plus rapide de spécifier le commit (C6 par exemple), mais faites-le plutôt avec les symboles de déplacement dont nous venons de parler !"]}}]},zh_CN:{childViews:[{type:"ModalAlert",options:{markdowns:["### 选择父提交记录","","操作符 `^` 与 `~` 符一样，后面也可以跟一个数字。","","但是该操作符后面的数字与 `~` 后面的不同，并不是用来指定向上返回几代，而是指定合并提交记录的某个父提交。还记得前面提到过的一个合并提交有两个父提交吧，所以遇到这样的节点时该选择哪条路径就不是很清晰了。","","Git 默认选择合并提交的“第一个”父提交，在操作符 `^` 后跟一个数字可以改变这一默认行为。","","废话不多说，举个例子。",""]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["这里有一个合并提交记录。如果不加数字修改符直接检出 `master^`，会回到第一个父提交记录。","","(*在我们的图示中，第一个父提交记录是指合并提交记录正上方的那个提交记录。*)"],afterMarkdowns:["这正是我们都已经习惯的方法。"],command:"git checkout master^",beforeCommand:"git checkout HEAD^; git commit; git checkout master; git merge C2"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["现在来试试选择另一个父提交……"],afterMarkdowns:["看见了吧？我们回到了另外一个父提交上。"],command:"git checkout master^2",beforeCommand:"git checkout HEAD^; git commit; git checkout master; git merge C2"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["使用 `^` 和 `~` 可以自由地在提交树中移动，非常给力："],afterMarkdowns:["快若闪电！"],command:"git checkout HEAD~; git checkout HEAD^2; git checkout HEAD~2",beforeCommand:"git commit; git checkout C0; git commit; git commit; git commit; git checkout master; git merge C5; git commit"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["更厉害的是，这些操作符还支持链式操作！试一下这个："],afterMarkdowns:["和前面的结果一样，但只用了一条命令。"],command:"git checkout HEAD~^2~2",beforeCommand:"git commit; git checkout C0; git commit; git commit; git commit; git checkout master; git merge C5; git commit"}},{type:"ModalAlert",options:{markdowns:["### 课后小练习","","要完成此关，在指定的目标位置创建一个新的分支。","","很明显可以简单地直接使用提交记录的哈希值（比如 `C6`），但我要求你使用刚刚讲到的相对引用修饰符！"]}}]},es_AR:{childViews:[{type:"ModalAlert",options:{markdowns:["### Especificando los padres","","Como el modificador de `~`, `^` también acepta un número opcional después de él.","","En lugar de especificar cuántas generaciones hacia atrás ir (como `~`), el modificador de `^` especifica por cuál de las referencias padres seguir en un commit de merge. Recordá que un commit de merge tiene múltiples padres, por lo que el camino a seguir es ambiguo.","",'Git normalmente sigue el "primer" padre de un commit de merge, pero especificando un número junto con `^` cambia este comportamiento predefinido.',"","Demasiada charla, veámoslo en acción.",""]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Acá tenemos un commit de merge. Si hacemos checkout de `master^`, sin modificadores, vamos a seguir al primer padre después del commit de merge. ","","(*En nuestras visualizaciones, el primer padre se ubica directamente arriba del commit de merge.*)"],afterMarkdowns:["Fácil -- esto es a lo que estamos acostumbrados."],command:"git checkout master^",beforeCommand:"git checkout HEAD^; git commit; git checkout master; git merge C2"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Ahora tratemos de especificar el segundo padre, en cambio..."],afterMarkdowns:["¿Ves? Seguimos al otro padre hacia arriba."],command:"git checkout master^2",beforeCommand:"git checkout HEAD^; git commit; git checkout master; git merge C2"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Los modificadores de `^` y `~` son muy poderosos a la hora de movernos en un árbol:"],afterMarkdowns:["¡Rapidísimo!"],command:"git checkout HEAD~; git checkout HEAD^2; git checkout HEAD~2",beforeCommand:"git commit; git checkout C0; git commit; git commit; git commit; git checkout master; git merge C5; git commit"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Más loco aún, ¡estos modificadores pueden encadenarse entre sí! Mirá esto:"],afterMarkdowns:["El mismo movimiento que antes, pero todo en uno."],command:"git checkout HEAD~^2~2",beforeCommand:"git commit; git checkout C0; git commit; git commit; git commit; git checkout master; git merge C5; git commit"}},{type:"ModalAlert",options:{markdowns:["### Ponelo en práctica","","Para completar este nivel, creá una nueva rama en la ubicación indicada.","","Obviamente sería muy fácil especificar el commit directamente (algo como `C6`), pero te reto a usar los modificadores de los que estuvimos hablando, mejor"]}}]},es_ES:{childViews:[{type:"ModalAlert",options:{markdowns:["### Especificando los padres","","Como el modificador de `~`, `^` también acepta un número opcional después de él.","","En lugar de especificar cuántas generaciones hacia atrás ir (como `~`), el modificador de `^` especifica por cuál de las referencias padres seguir en un commit de merge. Recuerda que un commit de merge tiene múltiples padres, por lo que el camino a seguir es ambiguo.","",'Git normalmente sigue el "primer" padre de un commit de merge, pero especificando un número junto con `^` cambia este comportamiento predefinido.',"","Demasiada charla, veámoslo en acción.",""]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Aquí tenemos un commit de merge. Si hacemos checkout de `master^`, sin modificadores, vamos a seguir al primer padre después del commit de merge. ","","(*En nuestras visualizaciones, el primer padre se ubica directamente arriba del commit de merge.*)"],afterMarkdowns:["Fácil -- esto es a lo que estamos acostumbrados."],command:"git checkout master^",beforeCommand:"git checkout HEAD^; git commit; git checkout master; git merge C2"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Ahora tratemos de especificar el segundo padre, en cambio..."],afterMarkdowns:["¿Ves? Seguimos al otro padre hacia arriba."],command:"git checkout master^2",beforeCommand:"git checkout HEAD^; git commit; git checkout master; git merge C2"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Los modificadores de `^` y `~` son muy poderosos a la hora de movernos en un árbol:"],afterMarkdowns:["¡Rapidísimo!"],command:"git checkout HEAD~; git checkout HEAD^2; git checkout HEAD~2",beforeCommand:"git commit; git checkout C0; git commit; git commit; git commit; git checkout master; git merge C5; git commit"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Más loco aún, ¡estos modificadores pueden encadenarse entre sí! Mira esto:"],afterMarkdowns:["El mismo movimiento que antes, pero todo en uno."],command:"git checkout HEAD~^2~2",beforeCommand:"git commit; git checkout C0; git commit; git commit; git commit; git checkout master; git merge C5; git commit"}},{type:"ModalAlert",options:{markdowns:["### Ponlo en práctica","","Para completar este nivel, crea una nueva rama en la ubicación indicada.","","Obviamente sería muy fácil especificar el commit directamente (algo como `C6`), pero te reto a usar los modificadores de los que estuvimos hablando, mejor"]}}]},pt_BR:{childViews:[{type:"ModalAlert",options:{markdowns:["### Especificando pais","","Assim como o modificador `~`, o modificador `^` também aceita um número opcional depois dele.","","Em vez de especificar o número de gerações a voltar (que é o que o `~` faz), o modificador no `^` especifica qual referência de pai a ser seguida a partir de um commit de merge. Lembre-se que commits de merge possuem múltiplos pais, então o caminho a seguir é ambíguo.","",'O Git normalmente subirá o "primeiro" pai de um commit de merge, mas especificar um número após o `^` muda esse comportamento padrão.',"","Basta de conversa, vejamos o operador em ação.",""]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Aqui temos um commit de merge. Se fizermos checkout em `master^` sem especificar um número, vamos seguir o primeiro pai acima do commit de merge. ","","(*Em nossa visualização, o primeiro pai é aquele diretamente acima do commit de merge.*)"],afterMarkdowns:["Fácil -- isso é aquilo com o que já estamos acostumados."],command:"git checkout master^",beforeCommand:"git checkout HEAD^; git commit; git checkout master; git merge C2"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Agora vamos, em vez disso, especificar o segundo pai..."],afterMarkdowns:["Viu? Subimos para o outro pai."],command:"git checkout master^2",beforeCommand:"git checkout HEAD^; git commit; git checkout master; git merge C2"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Os modificadores `^` e `~` podem tornar a movimentação ao redor da árvore de commits muito poderosa:"],afterMarkdowns:["Rápido como a luz!"],command:"git checkout HEAD~; git checkout HEAD^2; git checkout HEAD~2",beforeCommand:"git commit; git checkout C0; git commit; git commit; git commit; git checkout master; git merge C5; git commit"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Ainda mais louco, esses modificadores podem ser encadeados em conjunto! Veja só:"],afterMarkdowns:["O mesmo movimento que o anterior, mas tudo em um único comando."],command:"git checkout HEAD~^2~2",beforeCommand:"git commit; git checkout C0; git commit; git commit; git commit; git checkout master; git merge C5; git commit"}},{type:"ModalAlert",options:{markdowns:["### Coloque em prática","","Para completar este nível, crie um novo ramo no destino especificado.","","Obviamente seria mais fácil especificar o commit diretamente (com algo como `C6`), mas em vez disso eu desafio você a usar os modificadores sobre os quais falamos!"]}}]},gl:{childViews:[{type:"ModalAlert",options:{markdowns:["### Especificando pais","","Tanto o modificador `~`, como o modificador `^` aceptan un número opcional despois del.","","Mellor que especificar o número de commits que percorrer cara atrás (que é o que o `~` fai), o modificador sobre `^` especifica  qué referencia do pai vai ser seguida dende o commit con merge. Lembra qué os commits do merge teñen varios pais, entón o camiño a seguir é ambiguo.","",'Git normalmente seguirá ó "primeiro" pai de un commit de merge, pero especificando un número co `^` muda o comportamento do pai.',"","Xa chega de faladoiros, vexamos o comando en acción.",""]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Aquí temos un commit do merge. Se fixéramos checkout en `master^` sen especificar un número, imos seguir ó primeiro pai enriba do commit do merge. ","","(*Na nosa vista, o primeiro pai é aquel directamente enriba do commit do merge.*)"],afterMarkdowns:["Sinxelo, eso é aquelo co que xa estamos acostumados."],command:"git checkout master^",beforeCommand:"git checkout HEAD^; git commit; git checkout master; git merge C2"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Agora imos, en vez de iso, especificar o segundo pai..."],afterMarkdowns:["¿Viches? Subimos para o outro pai."],command:"git checkout master^2",beforeCommand:"git checkout HEAD^; git commit; git checkout master; git merge C2"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Os modificadores `^` e `~` pódense mover ao redor da árbore de commits con moito poder:"],afterMarkdowns:["Rápido coma a luz!"],command:"git checkout HEAD~; git checkout HEAD^2; git checkout HEAD~2",beforeCommand:"git commit; git checkout C0; git commit; git commit; git commit; git checkout master; git merge C5; git commit"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Aínda máis tolo, eses modificadores poden ser encadeados en conxunto! Olla ahí:"],afterMarkdowns:["O mesmo movemento feito antes, pero feito nun só comando."],command:"git checkout HEAD~^2~2",beforeCommand:"git commit; git checkout C0; git commit; git commit; git commit; git checkout master; git merge C5; git commit"}},{type:"ModalAlert",options:{markdowns:["### Pono na práctica","","Para completar este nível, crea unha nova rama no destino especificado.","","Obviamente sería máis sinxelo especificar o commit diretamente (algo como `C6`), pero en vez de facer eso, ¡podes usar os modificadores dos que falamos!"]}}]},zh_TW:{childViews:[{type:"ModalAlert",options:{markdowns:["### 選擇 parent commit","","和 `~` 符號一樣，`^` 符號的後面也可以接一個（可選的）數字。","","這不是用來指定往上回去幾代（`~` 的作用），`^` 後面所跟的數字表示我要選擇哪一個 parent commit。還記得一個 merge commit 可以有多個 parent commit 吧，所以當我們要選擇走到哪一個 parent commit 的時候就會比較麻煩了。","",'git 預設會選擇 merge commit 的"第一個" parent commit，使用 `^` 後面接一個數字可以改變這個預設的行為。',"","廢話不多說，舉一個例子。",""]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["這裡有一個 merge commit。如果後面不加數字的話會直接切換到`master^`，也就是說會回到第一個 parent commit。","","(*在我們的圖示中，第一個 parent commit 是指 merge commit 正上方的那一個 parent commit。*)"],afterMarkdowns:["簡單吧！這就是預設的情況。"],command:"git checkout master^",beforeCommand:"git checkout HEAD^; git commit; git checkout master; git merge C2"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["現在來試試選擇第二個 parent commit..."],afterMarkdowns:["看到了嗎？我們回到了第二個 parent commit。"],command:"git checkout master^2",beforeCommand:"git checkout HEAD^; git commit; git checkout master; git merge C2"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["使用`^`和`~`可以自由在 commit tree 中移動："],afterMarkdowns:["簡直就像是電光石火！"],command:"git checkout HEAD~; git checkout HEAD^2; git checkout HEAD~2",beforeCommand:"git commit; git checkout C0; git commit; git commit; git commit; git checkout master; git merge C5; git commit"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["再瘋狂點，這些符號可以被連在一起！試一下這個："],afterMarkdowns:["和前面的結果一樣，但只用了一條指令。"],command:"git checkout HEAD~^2~2",beforeCommand:"git commit; git checkout C0; git commit; git commit; git commit; git checkout master; git merge C5; git commit"}},{type:"ModalAlert",options:{markdowns:["### 練習一下","","要完成這一關，在指定的目標位置上面建立一個新的 branch。","","很明顯可以直接使用 commit 的 hash 值（比如 `C6`），但我要求你使用剛剛講到的相對引用的符號！"]}}]},ru_RU:{childViews:[{type:"ModalAlert",options:{markdowns:["### Определение родителей","","Так же как тильда (~), каретка (^) принимает номер после себя.","","Но в отличие от количества коммитов, на которые нужно откатиться назад (как делает `~`), номер после `^` определяет, на какого из родителей мерджа надо перейти. Учитывая, что мерджевый коммит имеет двух родителей, просто указать ^ нельзя.","",'Git по умолчанию перейдёт на "первого" родителя коммита, но указание номера после `^` изменяет это поведение.',"","Посмотрим, как это работает.",""]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Вот мерджевый коммит. Если мы перейдём на `master^` без номера, то попадём на первого родителя.","","(*На нашей визуализации первый родитель находится прямо над коммитом*)"],afterMarkdowns:["Просто - прямо как мы любим."],command:"git checkout master^",beforeCommand:"git checkout HEAD^; git commit; git checkout master; git merge C2"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Теперь попробуем перейти на второго родителя."],afterMarkdowns:["Вот. Мы на втором родительском коммите."],command:"git checkout master^2",beforeCommand:"git checkout HEAD^; git commit; git checkout master; git merge C2"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Модификаторы `^` и `~` сильно помогают перемещаться по дереву коммитов:"],afterMarkdowns:["Быстро как Флэш!"],command:"git checkout HEAD~; git checkout HEAD^2; git checkout HEAD~2",beforeCommand:"git commit; git checkout C0; git commit; git commit; git commit; git checkout master; git merge C5; git commit"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Более того, эти модификаторы можно применять вместе. Например, так:"],afterMarkdowns:["Сделаем то же самое, что перед этим, только в одну команду."],command:"git checkout HEAD~^2~2",beforeCommand:"git commit; git checkout C0; git commit; git commit; git commit; git checkout master; git merge C5; git commit"}},{type:"ModalAlert",options:{markdowns:["### На практике","","Чтобы пройти этот уровень, создай ветку в указанном месте.","","Очевидно, что (в данном случае) будет проще указать коммит напрямую, но для того, чтобы закрепить пройденное, используй модификаторы, о которых мы говорили выше."]}}]},ja:{childViews:[{type:"ModalAlert",options:{markdowns:["### 親の指定","","`~`修飾子と同じように、`^`修飾子も後に任意の番号を置くことができます。","","指定した数だけ遡る（これは`~`の場合の機能）のではなく、`^`はマージコミットからどの親を選択するかを指定できます。マージコミットは複数の親で構成されるので、選択する経路が曖昧であることを覚えておいてください。","","Gitは通常、マージコミットから「一つ目」の親、マージされた側のブランチの親を選びます。しかし、`^`で数を指定することでこのデフォルトの動作を変えることができます。","","では、実際の動作を見ていきましょう。",""]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["ここに、マージコミットがあります。もし、指定無しに`master^`でチェックアウトした場合、私たちは一番目の親に移動することになります。","","(*私たちのツリーでは、一番目の親はマージコミットのちょうど上に位置しています。*)"],afterMarkdowns:["簡単ですね -- これがデフォルトの動作になります。"],command:"git checkout master^",beforeCommand:"git checkout HEAD^; git commit; git checkout master; git merge C2"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["それでは代わりに二つ目の親を指定してみます"],afterMarkdowns:["見ましたか？私たちは他の親に移ることができました。"],command:"git checkout master^2",beforeCommand:"git checkout HEAD^; git commit; git checkout master; git merge C2"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["`^`修飾子と`~`修飾子は、コミット履歴を辿るのを強力に補助してくれます:"],afterMarkdowns:["超高速ですね！"],command:"git checkout HEAD~; git checkout HEAD^2; git checkout HEAD~2",beforeCommand:"git commit; git checkout C0; git commit; git commit; git commit; git checkout master; git merge C5; git commit"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["より素晴らしいことに、これらの修飾子は連鎖させることができます！これを見てください:"],afterMarkdowns:["前と同じ移動ですが、なんと一つのコマンドでできています。"],command:"git checkout HEAD~^2~2",beforeCommand:"git commit; git checkout C0; git commit; git commit; git commit; git checkout master; git merge C5; git commit"}},{type:"ModalAlert",options:{markdowns:["### 練習課題","","このレベルをクリアするためには、まず新しいブランチを指定したように作成します。","","明らかに直接コミットを指定した方が（`C6`というように）簡単ですが、私は今まで述べたような修飾子を使う方法で挑戦してもらいたいと思います。"]}}]},ko:{childViews:[{type:"ModalAlert",options:{markdowns:["### 부모를 선택하기","","`~` 수식처럼 `^` 수식 또한 뒤에 숫자를 추가 할 수 있습니다.","","몇개의 세대를 돌아갈지 정하는 것 대신(`~`의 기능) `^`수식은 병합이된 커밋에서 어떤 부모를 참조할지 선택할 수 있습니다. 병합된 커밋들은 다수의 부모를 가지고 있다는것을 기억하시나요? 어떤 부모를 선택할지 예측할 수가 없습니다.","",'Git은 보통 병합된 커밋에서 "첫"부모를 따라갑니다. 하지만 `^`수식을 를 숫자와 함께 사용하면 앞의 디폴트 동작대로가 아닌 다른 결과가 나타납니다.',"","이만 줄이고, 직접 확인해봅시다.",""]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["여기 병합된 커밋이 있습니다. 우리가 `master`를 수식없이 체크아웃한다면 병합된 커밋의 첫 부모를 따라 올라갈 것입니다. ","","(*화면에서는 첫 부모는 병합된 커밋 바로 위에 위치해 있습니다.*)"],afterMarkdowns:["간단하죠 -- 우리한테 익숙한 모습입니다."],command:"git checkout master^",beforeCommand:"git checkout HEAD^; git commit; git checkout master; git merge C2"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["자 이제 두번째 부모를 선택해봅시다..."],afterMarkdowns:["보이나요? 다른 부모를 선택해 올라갔습니다."],command:"git checkout master^2",beforeCommand:"git checkout HEAD^; git commit; git checkout master; git merge C2"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["`^`수식과 `~`수식을 이용해 커밋트리에서 효과적으로 움직일 수 있습니다.:"],afterMarkdowns:["빛처럼 빠르게 말이죠!"],command:"git checkout HEAD~; git checkout HEAD^2; git checkout HEAD~2",beforeCommand:"git commit; git checkout C0; git commit; git commit; git commit; git checkout master; git merge C5; git commit"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["더 대단한것은 이 수식들은 같이 사용할 수 있다는 겁니다! 확인해봅시다:"],afterMarkdowns:["앞과 같은 움직임이지만 하나의 명령으로 표현되었습니다."],command:"git checkout HEAD~^2~2",beforeCommand:"git commit; git checkout C0; git commit; git commit; git commit; git checkout master; git merge C5; git commit"}},{type:"ModalAlert",options:{markdowns:["### 직접 확인해봅시다","","이 레벨을 완료하기 위해서 정해진 목적지에 새 브랜치를 생성하세요.","","물론 커밋을 직접 특정지어주면 아주 쉽겠지만(`C6`과 같이), 수식을 익혀볼겸 배운것을 사용해 도전해 봅시다!"]}}]},uk:{childViews:[{type:"ModalAlert",options:{markdowns:["### Вибираємо Попередників","","Так само як і модифікатор `~`, модифікатор `^` також приймає необов’язкове число після нього.","","Замість того, щоб вказувати кількість генерацій щоб переміститись назад  (те що робить `~`), число після `^` вказує на яке батьківське посилання мерджу потрібно перейти. Зауважте що так як мерджевий коміт має декілька батьків, використання '^' без числа є неоднозначним.","",'Git зазвичай перейде на "першого" з батьків вверх з мерджевого коміту, але вказання числа після  `^` змінює цю поведінку. ',"","Годі ляси точити, перевірмо як це працює в дії.",""]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Ось ми маємо мерджевий коміт. Якщо зробимо checkout `master^` без числа, ми потрапимо на першого з предків ","","(*В нашій візуалізації перший предок знаходиться прямо над мерджевим комітом*)"],afterMarkdowns:["Легко -- те до чого ми всі звикли."],command:"git checkout master^",beforeCommand:"git checkout HEAD^; git commit; git checkout master; git merge C2"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Тепер спробуймо натомість вказати другого батька..."],afterMarkdowns:["Бачиш? Ми перейшли до другого батька вверх."],command:"git checkout master^2",beforeCommand:"git checkout HEAD^; git commit; git checkout master; git merge C2"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Модифікатори `^` та `~` дозволяють легко пересуватися деревом комітів:"],afterMarkdowns:["Супер швидко!"],command:"git checkout HEAD~; git checkout HEAD^2; git checkout HEAD~2",beforeCommand:"git commit; git checkout C0; git commit; git commit; git commit; git checkout master; git merge C5; git commit"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Більше того, ці модифікатори можна використовувати разом! Заціни:"],afterMarkdowns:["Те саме, що й перед цим, але однією командою."],command:"git checkout HEAD~^2~2",beforeCommand:"git commit; git checkout C0; git commit; git commit; git commit; git checkout master; git merge C5; git commit"}},{type:"ModalAlert",options:{markdowns:["### Практика","","Щоб завершити цей рівень, створи нову гілку на вказаному місці.","","Очевидно, що в данному випадку досить легко вказати коміт напряму (щось на зразок checkout `C6`), але для закріплення матеріалу використай модифікатори, про які ми щойно говорили!"]}}]},vi:{childViews:[{type:"ModalAlert",options:{markdowns:["### Tìm về cội nguồn","","Cũng giống ký hiệu `~`, ta cũng có thể thêm số theo sau ký hiệu `^`.","","Nhưng mà không giống như (`~`) con số theo sau là số lượng thế hệ commit, con số theo sau `^` chỉ định commit cha từ commit merge. Hãy nhớ rằng commit merge có nhiều cha, cho nên chọn cha nào cũng khá là mơ hồ.","",'Thông thường thì sẽ chọn cha "đầu tiên" từ commit merge, nhưng nếu sau dấu `^` có một con số thì cách hành xử sẽ khác đi.',"","Không nói dông dài nữa, làm thử một ví dụ nào",""]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Ở đây ta có 1 commit merge. Nếu ta dùng lệnh `master^` mà không bổ nghĩa cho nó, ta sẽ đi ngược lên commit cha đầu tiên của merge commit. ","","(*Trong hình minh họa bên trái thì commit cha đầu tiên được xếp hẳng hàng ngay phía trên của commit merge.*)"],afterMarkdowns:["Dễ dàng -- đó là cách mà ta thường làm."],command:"git checkout master^",beforeCommand:"git checkout HEAD^; git commit; git checkout master; git merge C2"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Nào bây giờ hãy chỉ định commit cha thứ hai thử..."],afterMarkdowns:["Thấy chứ? Ta đã leo lên commit cha khác lúc trước."],command:"git checkout master^2",beforeCommand:"git checkout HEAD^; git commit; git checkout master; git merge C2"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Dùng bổ ngữ `^` và `~` cho ta khả năng di chuyển trên cây lịch sử:"],afterMarkdowns:["Nhanh như chớp!"],command:"git checkout HEAD~; git checkout HEAD^2; git checkout HEAD~2",beforeCommand:"git commit; git checkout C0; git commit; git commit; git commit; git checkout master; git merge C5; git commit"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Thâm chí còn ghê gớm hơn khi ta kết hợp chúng với nhau! Hãy xem thử:"],afterMarkdowns:["Cùng con đường như lúc trước, nhưng chỉ cần 1 dòng lệnh."],command:"git checkout HEAD~^2~2",beforeCommand:"git commit; git checkout C0; git commit; git commit; git commit; git checkout master; git merge C5; git commit"}},{type:"ModalAlert",options:{markdowns:["### Áp dụng thực hành nào","","Để hoàn thành cấp độ này, hãy tạo ra một nhánh mới ở vị trí chỉ định.","","Dùng cách chỉ định trực tiếp commit (như là dùng `C6` chẳng hạn) thì dễ quá, nhưng thử thách ở đây là dùng các bổ ngữ đã học ở trên!"]}}]}}}},{}],113:[function(e,t,o){o.levelSequences={intro:[e("./intro/commits").level,e("./intro/branching").level,e("./intro/merging").level,e("./intro/rebasing").level],rampup:[e("./rampup/detachedHead").level,e("./rampup/relativeRefs").level,e("./rampup/relativeRefs2").level,e("./rampup/reversingChanges").level],move:[e("./rampup/cherryPick").level,e("./rampup/interactiveRebase").level],mixed:[e("./mixed/grabbingOneCommit").level,e("./mixed/jugglingCommits").level,e("./mixed/jugglingCommits2").level,e("./mixed/tags").level,e("./mixed/describe").level],advanced:[e("./rebase/manyRebases").level,e("./advanced/multipleParents").level,e("./rebase/selectiveRebase").level],remote:[e("./remote/clone").level,e("./remote/remoteBranches").level,e("./remote/fetch").level,e("./remote/pull").level,e("./remote/fakeTeamwork").level,e("./remote/push").level,e("./remote/fetchRebase").level,e("./remote/lockedMaster").level],remoteAdvanced:[e("./remote/pushManyFeatures").level,e("./remote/mergeManyFeatures").level,e("./remote/tracking").level,e("./remote/pushArgs").level,e("./remote/pushArgs2").level,e("./remote/fetchArgs").level,e("./remote/sourceNothing").level,e("./remote/pullArgs").level]};var n=o.sequenceInfo={intro:{displayName:{en_US:"Introduction Sequence",de_DE:"Einführung",ja:"まずはここから",fr_FR:"Séquence d'introduction",es_AR:"Secuencia introductoria",es_ES:"Secuencia introductoria",pt_BR:"Sequência introdutória",gl:"Secuencia introductoria",zh_CN:"基础篇",zh_TW:"基礎篇",ko:"git 기본",ru_RU:"Введение",uk:"Вступ",vi:"Giới thiệu chuỗi luyện tập"},about:{en_US:"A nicely paced introduction to the majority of git commands",de_DE:"Eine gut abgestimmte Einführung in die wichtigsten Git-Befehle",ja:"gitの基本的なコマンド群をほどよいペースで学ぶ",fr_FR:"Une introduction en douceur à la majorité des commandes git",es_AR:"Una breve introducción a la mayoría de los comandos de git",es_ES:"Una breve introducción a la mayoría de los comandos de git",pt_BR:"Uma breve introdução à maioria dos comandos do git",gl:"Unha breve introducción á maioría dos comandos de git",zh_CN:"循序渐进地介绍 Git 主要命令",zh_TW:"循序漸進地介紹 git 主要命令",ko:"git의 주요 명령어를 깔끔하게 알려드립니다",ru_RU:"Хорошо подобранное введение в основные команды git",uk:"Гарно підібране введення в основні команди git",vi:"Từng bước làm quen với phần lớn lệnh điều khiển git"}},rampup:{displayName:{en_US:"Ramping Up",de_DE:"Aufstieg",ja:"次のレベルに進もう",fr_FR:"Montée en puissance",es_AR:"Acelerando",es_ES:"Acelerando",pt_BR:"Acelerando",gl:"Alixeirando",zh_CN:"高级篇",zh_TW:"進階篇",ru_RU:"Едем дальше",uk:"Їдемо далі",ko:"다음 단계로",vi:"Tăng tốc"},about:{en_US:"The next serving of 100% git awesomes-ness. Hope you're hungry",de_DE:"Eine Portion Git-Wahnsinn zum Thema Navigation",ja:"更にgitの素晴らしさを堪能しよう",fr_FR:"Le prochain excellent plat de pur git. J'espère que vous êtes affamés",es_AR:"La próxima porción de 100% maravillas git. Espero que estés hambriento",es_ES:"La próxima ración de git. Espero que estés hambriento",pt_BR:"A próxima porção de maravilhas do git. Faminto?",gl:"A próxima porción das marabillas de git. Agardo que estés esfameado",zh_CN:"要开始介绍 Git 的超棒特性了，快来吧！",zh_TW:"接下來是 git 非常厲害的地方！相信你已經迫不及待了吧！",ru_RU:"Следующая порция абсолютной git-крутотенюшки. Проголодались?",uk:"Наступна порція абсолютної git-дивини. Сподіваюсь, ви зголодніли",ko:"git은 아주 멋져요. 왜 멋진지 알려드립니다",vi:"Tận hưởng khẩu phần tuyệt hảo của git. Hi vọng bạn còn đói."}},remote:{tab:"remote",displayName:{en_US:"Push & Pull -- Git Remotes!",de_DE:"Push & Pull -- entfernte Repositorys",ja:"Push及びPullコマンド -- Gitリモート",fr_FR:"Push & Pull -- dépôts gits distants !",es_AR:"Push & Pull -- Git Remotes!",es_ES:"Push y Pull -- Git Remotes!",pt_BR:"Push & Pull -- repositórios remotos no Git!",gl:"Push & Pull -- Repositorios remotos no Git!",zh_CN:"Push & Pull —— Git 远程仓库！",zh_TW:"Push & Pull -- Git Remotes!",ru_RU:"Push & Pull - удалённые репозитории в Git!",uk:"Push & Pull -- віддалені репозиторії в Git!",ko:"Push & Pull -- Git 원격 저장소!",vi:"Push & Pull -- Tác động git từ xa!"},about:{en_US:"Time to share your 1's and 0's kids; coding just got social",fr_FR:"C'est le temps de partager vos 1 et vos 0 les enfants, le code vient de devenir social.",ja:"自分のコードをより広く公開しましょう",de_DE:"Zeit Eure 1en und 0en zu teilen; Coding mit sozialer Komponente",es_AR:"Hora de compartir sus 1's y 0's, chicos; programar se volvió social!",es_ES:"Hora de compartir vuestros 1's y 0's, chicos; programar se volvió social!",pt_BR:"Hora de compartilhar seus 1's e 0's, crianças; programar agora é social!",gl:"Hora de compartilos seus 1' e 0's, rapaces; programar agora é social!",zh_CN:"是时候分享你的代码了，让编码变得社交化吧",zh_TW:"是時候分享你的程式碼了",ru_RU:"Настало время поделиться своими единичками и нулями. Время коллективного программирования",uk:"Настав час поділитися своїми нулями та одиничками; соціальне програмування",ko:"내 코드를 공개할 때가 되었습니다. 코드를 공개해봅시다!",vi:"Chia sẻ đứa con tinh thần '0' và '1' của bạn; mã đã đến với cộng đồng"}},remoteAdvanced:{tab:"remote",displayName:{en_US:"To Origin And Beyond -- Advanced Git Remotes!",de_DE:"Bis zum origin und noch weiter",ja:'"origin"とその先へ -- Gitリモート上級編',fr_FR:"Vers l'infini et au-delà -- dépôts distants version avancée",es_AR:"Hasta el origin y más allá -- Git Remotes avanzado!",es_ES:"Hasta el origen y más allá -- Git Remotes avanzado!",pt_BR:"Até a origin e além -- repositórios remotos avançados!",gl:"Ata á orixe e máis aló -- repositorios remotos avanzados!",zh_CN:"关于 origin 和它的周边 —— Git 远程仓库高级操作",zh_TW:"關於 origin 和其它 repo，git remote 的進階指令",ru_RU:"Через origin – к звёздам. Продвинутое использование Git Remotes",uk:"Через origin – до зірок. Прогресивне використання Git Remotes",ko:'"origin"그 너머로 -- 고급 Git 원격 저장소',vi:"Về với cội nguồn và vươn xa hơn -- nâng cao về các git remote"},about:{en_US:"And you thought being a benevolent dictator would be fun...",fr_FR:"Et vous pensiez qu'être un dictateur bienfaisant serait amusant...",ja:"絶えず上級者の仕事は存在する。。。",es_AR:"Y pensabas que ser un dictador benévolo sería divertido...",es_ES:"Y pensabas que ser un dictador benévolo sería divertido...",pt_BR:"E você achava que ser um déspota esclarecido seria mais divertido...",gl:"E pensabas que ser un dictador benévolo sería divertido...",zh_CN:"做一名仁慈的独裁者一定会很有趣……",zh_TW:"而且你會覺得做一個仁慈的獨裁者會很有趣...",de_DE:"Git Remotes für Fortgeschrittene",ru_RU:"Весело было быть всесильным мудрым правителем...",uk:"А ти думав, що бути всесильним диктатором весело...",ko:"자비로운 독재자가 되는게 재밌을 줄 알았겠지만...",vi:"Và bạn nghĩ làm một kẻ độc tài nhân từ thì sẽ vui ..."}},move:{displayName:{en_US:"Moving Work Around",de_DE:"Code Umherschieben",fr_FR:"Déplacer le travail",es_AR:"Moviendo el trabajo por ahí",es_ES:"Moviendo el trabajo por ahí",pt_BR:"Movendo trabalho por aí",gl:"Movendo o traballo por ahí",ja:"コードの移動",ko:"코드 이리저리 옮기기",zh_CN:"移动提交记录",zh_TW:"調整提交順序",ru_RU:"Перемещаем труды туда-сюда",uk:"Переміщуємо роботу туди-сюди",vi:"Điều chỉnh vị trí"},about:{en_US:'"Git" comfortable with modifying the source tree :P',de_DE:"Gewöhn dich daran, den Git-Baum zu verändern",fr_FR:"Soyez à l'aise pour modifier l'arbre Git",es_AR:"Ponete cómodo con modificar el directorio fuente",es_ES:"Ponte cómodo cuando modifiques el directorio fuente",pt_BR:"Fique confortável em modificar a árvore de códigos",gl:"Ponte cómodo modificando a árbore de git",ko:"작업 트리를 수정하는건 식은죽 먹기지요 이제",ja:"話題のrebaseってどんなものだろう？って人にオススメ",zh_CN:"自由修改提交树",zh_TW:"自由修改提交樹",ru_RU:"Не стесняйтесь менять историю",uk:"Не соромимось змінювати історію",vi:"Chỉnh sửa cây lịch sử Git không hề khó"}},mixed:{displayName:{en_US:"A Mixed Bag",de_DE:"Ein Kessel Buntes",ja:"様々なtips",fr_FR:"Un assortiment",es_AR:"Bolsa de gatos",es_ES:"Un poco de todo",pt_BR:"Sortidos",gl:"Todo mesturado",ko:"종합선물세트",zh_CN:"杂项",zh_TW:"活用 git 的指令",ru_RU:"Сборная солянка",uk:"Всяке",vi:"Những trò mèo đáng đồng tiền bát gạo"},about:{en_US:"A mixed bag of Git techniques, tricks, and tips",de_DE:"Eine bunte Mischung von Techniken, Tipps und Tricks",ja:"gitを使う上での様々なtipsやテクニックなど",fr_FR:"Un assortiment de techniques et astuces pour utiliser Git",es_AR:"Un rejunte de técnicas, trucos y tips sobre Git",es_ES:"Un batiburrillo de técnicas, trucos y sugerencias sobre Git",pt_BR:"Técnicas, truques e dicas sortidas sobre Git",gl:"Mestura de técnicas, trucos e consellos",ko:"Git을 다루는 다양한 팁과 테크닉을 다양하게 알아봅니다",zh_CN:"Git 技术、技巧与贴士大集合",zh_TW:"git 的技術，招數與技巧",ru_RU:"Ассорти из приёмов работы с Git, хитростей и советов",uk:"Різні прийоми роботи з Git, хитрощі та поради",vi:"Các kỹ thuật, bí quyết, và mẹo vặt hữu ích"}},advanced:{displayName:{en_US:"Advanced Topics",de_DE:"Themen für Fortgeschrittene",ja:"上級トピック",fr_FR:"Sujets avancés",es_AR:"Temas avanzados",es_ES:"Temas avanzados",pt_BR:"Temas avançados",gl:"Temas avanzados",zh_CN:"高级话题",zh_TW:"進階主題",ru_RU:"Продвинутый уровень",uk:"Досвідчений рівень",ko:"고급 문제",vi:"Các chủ đề nâng cao"},about:{en_US:"For the truly brave!",de_DE:"... die nie ein Mensch zuvor gesehen hat.",ja:"勇気ある人のみ！",fr_FR:"Pour les plus courageux !",es_AR:"¡Para los verdaderos valientes!",es_ES:"¡Para los verdaderos valientes!",pt_BR:"Para os verdadeiros valentes!",gl:"¡Para os verdadeiros valerosos!",zh_CN:"只为真正的勇士！",zh_TW:"來成為真正的強者吧！",ru_RU:"Если ты смелый, ловкий, умелый – потренируйся тут",uk:"Для хоробрих",ko:"용기있는 도전자를 위해 준비한 문제입니다",vi:"Mạnh mẽ lên!"}}};o.getTabForSequence=function(e){var t=n[e];return t.tab?t.tab:"main"}},{"./advanced/multipleParents":112,"./intro/branching":114,"./intro/commits":115,"./intro/merging":116,"./intro/rebasing":117,"./mixed/describe":118,"./mixed/grabbingOneCommit":119,"./mixed/jugglingCommits":120,"./mixed/jugglingCommits2":121,"./mixed/tags":122,"./rampup/cherryPick":123,"./rampup/detachedHead":124,"./rampup/interactiveRebase":125,"./rampup/relativeRefs":126,"./rampup/relativeRefs2":127,"./rampup/reversingChanges":128,"./rebase/manyRebases":129,"./rebase/selectiveRebase":130,"./remote/clone":131,"./remote/fakeTeamwork":132,"./remote/fetch":133,"./remote/fetchArgs":134,"./remote/fetchRebase":135,"./remote/lockedMaster":136,"./remote/mergeManyFeatures":137,"./remote/pull":138,"./remote/pullArgs":139,"./remote/push":140,"./remote/pushArgs":141,"./remote/pushArgs2":142,"./remote/pushManyFeatures":143,"./remote/remoteBranches":144,"./remote/sourceNothing":145,"./remote/tracking":146}],114:[function(e,t,o){o.level={goalTreeString:'{"branches":{"master":{"target":"C1","id":"master"},"bugFix":{"target":"C1","id":"bugFix"}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"}},"HEAD":{"target":"bugFix","id":"HEAD"}}',solutionCommand:"git branch bugFix;git checkout bugFix",name:{en_US:"Branching in Git",de_DE:"Branches in Git",ja:"Gitのブランチ",ko:"Git에서 브랜치 쓰기",es_AR:"Brancheando en Git",es_ES:"Creando ramas en Git",pt_BR:"Ramos no Git",gl:"Ramas en Git",fr_FR:"Gérer les branches avec Git",zh_CN:"Git Branch",zh_TW:"建立 git branch",ru_RU:"Ветвление в Git",uk:"Розгалуження в Git",vi:"Rẽ nhánh với Git"},hint:{en_US:'Make a new branch with "git branch <branch-name>" and check it out with "git checkout <branch-name>"',de_DE:'Lege mit "git branch <Name>" einen neuen Branch an und checke ihn mit "git checkout <Name> aus',ja:'ブランチの作成（"git branch [ブランチ名]"）と、チェックアウト（"git checkout [ブランチ名]"）',es_AR:'Hacé una nueva rama con "git branch [nombre]" y cambiá a ella con "git checkout [nombre]"',es_ES:'Crea una nueva rama con "git branch [nombre]" y sitúate en ella con "git checkout [nombre]"',pt_BR:'Crie um novo ramo com "git branch [nome]" e mude para ele com "git checkout [nome]"',gl:'Crea unha nova rama con "git branch [nome]" e cambiate a ela facendo "git checkout [nome]"',fr_FR:'Faites une nouvelle branche avec "git branch [nom]" positionnez-vous dans celle-ci avec "git checkout [nom]"',zh_CN:"用 'git branch <分支名>' 来创建分支，用 'git checkout <分支名>' 来切换到分支",zh_TW:"用 'git branch [ branch 名稱]' 來建立 branch，用 'git checkout [ branch 名稱]' 切換到該 branch",ko:'"git branch [브랜치명]"으로 새 브랜치를 만들고, "git checkout [브랜치명]"로 그 브랜치로 이동하세요',ru_RU:'Создай новую ветку при помощи "git branch [name]" и перейди на неё при помощи "git checkout [name]"',uk:'Створи нову гілку за допомогою "git branch [ім’я]" й перейди на неї за допомогою "git checkout [ім’я]"',vi:'Tạo một nhánh mới với lệnh "git branch <ten-nhanh>" và chuyển sang đó với lệnh "git checkout <ten-nhanh>"'},disabledMap:{"git revert":!0},startDialog:{en_US:{childViews:[{type:"ModalAlert",options:{markdowns:["## Git Branches","","Branches in Git are incredibly lightweight as well. They are simply pointers to a specific commit -- nothing more. This is why many Git enthusiasts chant the mantra:","","```","branch early, and branch often","```","","Because there is no storage / memory overhead with making many branches, it's easier to logically divide up your work than have big beefy branches.","",'When we start mixing branches and commits, we will see how these two features combine. For now though, just remember that a branch essentially says "I want to include the work of this commit and all parent commits."']}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Let's see what branches look like in practice.","","Here we will create a new branch named `newImage`"],afterMarkdowns:["There, that's all there is to branching! The branch `newImage` now refers to commit `C1`"],command:"git branch newImage",beforeCommand:""}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Let's try to put some work on this new branch. Hit the button below"],afterMarkdowns:["Oh no! The `master` branch moved but the `newImage` branch didn't! That's because we weren't \"on\" the new branch, which is why the asterisk (*) was on `master`"],command:"git commit",beforeCommand:"git branch newImage"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Let's tell git we want to checkout the branch with","","```","git checkout <name>","```","","This will put us on the new branch before committing our changes"],afterMarkdowns:["There we go! Our changes were recorded on the new branch"],command:"git checkout newImage; git commit",beforeCommand:"git branch newImage"}},{type:"ModalAlert",options:{markdowns:["Ok! You are all ready to get branching. Once this window closes,","make a new branch named `bugFix` and switch to that branch.","","By the way, here's a shortcut: if you want to create a new ","branch AND check it out at the same time, you can simply ","type `git checkout -b [yourbranchname]`."]}}]},de_DE:{childViews:[{type:"ModalAlert",options:{markdowns:["## Branches in Git","","Branches sind in Git extrem schlank. Sie sind einfach Verweise auf einen bestimmten Commit -- das ist alles. Es ist unter Git-Enthusiasten deshalb gängige Praxis, früh und oft Branches anzulegen.","","Da das Anlegen von Branches keinen Plattenplatz und Speicher verbraucht, liegt es nahe die Arbeit in kleine logische Häppchen aufzuteilen, anstatt mit wenigen großen, monolithischen Branches zu hantieren.","",'Wir werden sehen wie Commits und Branches zusammengehören sobald wir anfangen mit beiden zu arbeiten. Bis hierhin merk dir einfach, dass ein Branch im Prinzip bedeutet "ich möchte die Arbeit, die in diesem Commit und seinen Vorgängern steckt, sichern".']}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Schauen wir mal, wie Branches in der Praxis aussehen.","","Wir legen einen neuen Branch an und nennen ihn `issue`:"],afterMarkdowns:["Und das war's auch schon, mehr ist es nicht. Der Branch `issue` zeigt nun auf den Commit `C1`."],command:"git branch issue",beforeCommand:""}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Lass uns mal ein wenig auf dem neuen Branch arbeiten. Machen wir einen Commit:"],afterMarkdowns:['Oi! Der Branch `master` hat sich verändert, aber der Branch `issue` nicht. Das liegt daran, dass wir nicht "auf" dem neuen Branch waren, weshalb das Sternchen `*` auch hinter `master` steht.'],command:"git commit",beforeCommand:"git branch issue"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Sagen wir Git also erst mal auf welchem Branch wir arbeiten wollen, und zwar mit","","```","git checkout <Name>","```","","Das wird uns auf den neuen Branch bringen bevor wir unsere Änderungen committen."],afterMarkdowns:["Und fertig! Unsere Änderungen wurden im neuen Branch gespeichert."],command:"git checkout issue; git commit",beforeCommand:"git branch issue"}},{type:"ModalAlert",options:{markdowns:["Cool! Jetzt bist du soweit, selbst Branches anzulegen. Wenn dieses Fenster geschlossen wurde, leg einen neuen Branch namens `bugFix` an und schalte auf diesen um."]}}]},ja:{childViews:[{type:"ModalAlert",options:{markdowns:["## Gitのブランチ","","Gitではコミットだけでなく、ブランチもまた信じられないほど軽量です。ブランチとは単に特定のコミットを指示したポインタにしか過ぎません。Gitの達人が決まってこう言うのは、そのためです：","","```","早めに、かつ頻繁にブランチを切りなさい","```","","どれほど多くのブランチを作ってもストレージやメモリを全然使わないので、ブランチを肥大化させるよりも論理的に分割していく方が簡単なのです。","","ブランチとコミットをあわせて使い始めると、これら2つの機能がどのように連動して機能するかがわかるでしょう。ここではとりあえず、ブランチは基本的には「あるコミットとその親のコミットたちを含めた全てのコミット」のことを呼ぶと覚えておいてください。"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["では実際にブランチがどのようなものかを見ていきましょう。","","`newImage`という名前の新しいブランチを切ってみることにします。"],afterMarkdowns:["以上。必要な手順はこれだけです。いま作成された`newImage`ブランチは`C1`コミットを指しています。"],command:"git branch newImage",beforeCommand:""}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["この新しいブランチに何か変更を加えてみましょう。次のボタンを押してください。"],afterMarkdowns:["あらら、`newImage`ではなくて`master`ブランチが移動してしまいました。これは、私たちが`newImage`のブランチ上で作業していなかったためです。どのブランチで作業しているかは、アスタリスク(*)がついてるかどうかで分かります。"],command:"git commit",beforeCommand:"git branch newImage"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["今度は作業したいブランチ名をgitに伝えてみましょう。","","```","git checkout [ブランチ名]","```","","このようにして、コミットする前に新しいブランチへと作業ブランチを移動することができます。"],afterMarkdowns:["できましたね。今度は新しいブランチに対して変更を記録することができました。"],command:"git checkout newImage; git commit",beforeCommand:"git branch newImage"}},{type:"ModalAlert",options:{markdowns:["はい、これでもうどんなブランチでも切れますね。このウィンドウを閉じて、","`bugFix`という名前のブランチを作成し、そのブランチをチェックアウトしてみましょう。"]}}]},es_AR:{childViews:[{type:"ModalAlert",options:{markdowns:["## Ramas en Git","","Las ramas (branches) en Git son increíblemente livianas. Son sólo referencias a un commit específico - nada más. Por esto es que tantos entusiastas de Git siguen el mantra:","","```","brancheá temprano, y brancheá seguido","```","","Como no hay consumo extra de almacenamiento ni memoria al hacer varias ramas, es más fácil dividir lógicamente tu trabajo que tener un par de ramas grandes.","",'Cuando empecemos a mezclar ramas y commits, vamos a ver cómo se combinan estas dos herramientas. Por ahora, en cambio, simplemente recordá que una rama esencialmente dice "Quiero incluir el trabajo de este commit y todos su ancestros".']}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Veamos cómo se ven las ramas en práctica.","","Acá vamos a crear una rama nueva llamada `newImage`"],afterMarkdowns:["Ahí está, ¡eso es todo lo que hay que hacer para branchear! La rama `newImage` ahora referencia al commit `C1`"],command:"git branch newImage",beforeCommand:""}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Pongamos algo de trabajo en esta nueva rama. Apretá el botón de acá abajo"],afterMarkdowns:['¡Uh, no! ¡La rama `master` avanzó, pero `newImage` no! Eso es porque no estábamos "en" la rama nueva, y por eso el asterisco (*) estaba en `master`'],command:"git commit",beforeCommand:"git branch newImage"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Digámosle a git que queremos checkoutear esa rama con","","```","git checkout [name]","```","","Esto va a situarnos en esa rama antes de commitear nuestros cambios"],afterMarkdowns:["¡Ahí estamos! Nuestros cambios se registraron en nuestra nueva rama"],command:"git checkout newImage; git commit",beforeCommand:"git branch newImage"}},{type:"ModalAlert",options:{markdowns:["¡Ok! Ya estás listo para manejar ramas. Cuando se cierre esta ventana,","creá una nueva rama llamada `bugFix` y cambiate a ella"]}}]},es_ES:{childViews:[{type:"ModalAlert",options:{markdowns:["## Ramas en Git","","Las ramas (branches) en Git son increíblemente livianas. Son sólo referencias a un commit específico - nada más. Por esto es que tantos entusiastas de Git siguen el mantra:","","```","crea ramas al principio y hazlo también de manera frecuente","```","","Como no hay consumo extra de almacenamiento ni memoria al crear varias ramas, lógicamente es más fácil dividir tu trabajo que trabajar solamente con un par de ramas grandes.","",'Cuando empecemos a mezclar ramas y commits, vamos a ver cómo se combinan estas dos herramientas. Por ahora, en cambio, simplemente recuerda que una rama esencialmente dice "Quiero incluir el trabajo de este commit y todos su ancestros".']}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Veamos cómo son las ramas en la práctica.","","Ahora vamos a crear una rama nueva llamada `newImage`"],afterMarkdowns:["Ahí está, ¡eso es todo lo que hay que hacer para crear una rama! La rama `newImage` ahora referencia al commit `C1`"],command:"git branch newImage",beforeCommand:""}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Pongamos algo de trabajo en esta nueva rama. Aprieta el botón de aquí abajo"],afterMarkdowns:['¡Vaya! ¡La rama `master` avanzó, pero `newImage` no! Eso es porque no estábamos "en" la rama nueva, y por eso el asterisco (*) estaba en `master`'],command:"git commit",beforeCommand:"git branch newImage"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Digámosle a git que queremos hacer checkout a esa rama con","","```","git checkout [name]","```","","Esto va a situarnos en esa rama antes de hacer un commit con nuestros cambios"],afterMarkdowns:["¡Ahí estamos! Nuestros cambios se registraron en nuestra nueva rama"],command:"git checkout newImage; git commit",beforeCommand:"git branch newImage"}},{type:"ModalAlert",options:{markdowns:["¡Perfecto! Ya estás listo para trabajar con ramas. Cuando se cierre esta ventana,","crea una nueva rama llamada `bugFix` y cámbiate a ella"]}}]},pt_BR:{childViews:[{type:"ModalAlert",options:{markdowns:["## Ramos no Git","","Ramos no Git também são incrivelmente leves. Eles são simplesmente referências a um commit específico -- e nada mais. É por isso que muitos entusiastas do Git entoam o mantra:","","```","ramifique cedo, ramifique sempre","```","","Devido a não existir sobrecarga de armazenamento / memória associada à criação de ramos, é mais fácil dividir logicamente o seu trabalho do que ter ramos grandes e gordos.","",'Quando começarmos a misturar ramos e commits, vamos ver como esses dois recursos combinam bem. Por enquanto, só lembre que um ramo diz essencialmente "Quero incluir o trabalho deste commit e de todos os seus ancestrais".']}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Vejamos como os ramos funcionam na prática.","","Aqui vamos criar um novo ramo chamado `newImage`"],afterMarkdowns:["Veja, é só isso que você tem que fazer para ramificar! O ramo `newImage` agora se refere ao commit `C1`"],command:"git branch newImage",beforeCommand:""}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Vamos tentar colocar algum trabalho neste novo ramo. Clique no botão abaixo"],afterMarkdowns:['Ah não! O ramo `master` se moveu mas o `newImage` não! Isso é porque o novo ramo não era o "ativo", e é por isso que o asterisco (*) estava no `master`'],command:"git commit",beforeCommand:"git branch newImage"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Vamos contar ao git que queremos fazer checkout no ramo com:","","```","git checkout [nome]","```","","Isso vai nos situar no ramo antes de commitarmos nossas mudanças"],afterMarkdowns:["Aqui vamos nós! Nossas mudanças foram gravadas no novo ramo"],command:"git checkout newImage; git commit",beforeCommand:"git branch newImage"}},{type:"ModalAlert",options:{markdowns:["Ok! Vocês estão todos prontos para ramificar. Assim que esta janela fechar,","crie um novo ramo chamado `bugFix` e mude para esse ramo"]}}]},gl:{childViews:[{type:"ModalAlert",options:{markdowns:["## Ramas en Git","","As Ramas en Git son tamén increiblemente liviás. Elas sinxelamente son referencias a un mesmo commit específico, e nada máis. É por iso que moitos entusiastas do Git entonan o mantra:","","```","ramifica cedo, ramifica sempre","```","","Debido a non existir sobrecarga de memoria facendo moitas ramas, é máis sinxelo dividir a lóxica do teu traballo en ramas que ter unha enorme.","",'Cando comezamos a mesturar ramas e commits imos ver como eses dous recursos combínanse ben. Por agora lembra que unha rama esencialmente di "Quero incluír o traballo deste commit e de todos os seus ancestros".']}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Vexamos cómo as ramas funcionan na práctica.","","Aquí imos crear unha nova rama chamada `newImage`"],afterMarkdowns:["Mira, solo tes que poñer eso para crear unha rama! A rama `newImage` agora apunta ó commit `C1`"],command:"git branch newImage",beforeCommand:""}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Imos intentar colocar algún traballo nesta nova rama. Pincha no botón de abaixo"],afterMarkdowns:['¡Bueno home! A rama `master` moveuse pero a rama `newImage` non! Eso é porque a nova rama non era a "actual", e é por iso que o asterisco (*) ficaba na rama `master`'],command:"git commit",beforeCommand:"git branch newImage"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Ímoslle decir a Git que nos queremos mover á rama con:","","```","git checkout [nome]","```","","Esto vainos levar á rama que tiñamos antes de facer os nosos cambios."],afterMarkdowns:["¡Imos alá! Os nosos cambios foron grabados na nova rama."],command:"git checkout newImage; git commit",beforeCommand:"git branch newImage"}},{type:"ModalAlert",options:{markdowns:["¡Ok! Estas preparado para facer ramas. Así que podes pechar a ventá,","crear unha rama chamada `bugFix` e moverte para esa rama.","","Inda así, hai un atallo: se ti quixeras crear unha nova ","rama e moverte a ela ó mesmo tempo, ti podes escribir simplemente ","`git checkout -b [a-tua- rama]`."]}}]},fr_FR:{childViews:[{type:"ModalAlert",options:{markdowns:["## Branches Git","","Les branches sous Git sont incroyablement légères. Elles sont simplement des références sur un commit spécifique -- rien de plus. C'est pourquoi beaucoup d'enthousiastes répètent en cœur :","","```","des branches le plus tôt possible, et des branches souvent","```","","Parce qu'il n'y a pas de surcoût (stockage/mémoire) associé aux branches, il est facile de diviser son travail en de nombreuses branches plutôt que d'avoir quelques grosses branches.","","Nous verrons comment les branches et les commits interagissent quand nous les utiliserons ensemble. Pour l'instant, souvenez-vous qu'une branche est un moyen d'exprimer \"Je veux inclure le contenu de ce commit et de tous les commits parents.\""]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Regardons à quoi ressemblent les branches en pratique.","","Nous allons nous positionner (checkout) dans une nouvelle branche appellée `newImage`"],afterMarkdowns:["Et voilà, c'est tout ! La branche `newImage` se réfère désormais au commit `C1`"],command:"git branch newImage",beforeCommand:""}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Travaillons mainenant dans cette branche. Appuyez sur le bouton ci-dessous."],afterMarkdowns:["Oh non! La branche `master` a bougé mais pas la branche `newImage` ! C'est parce que nous n'étions pas  \"sur\" la nouvelle branche, comme indiqué par l'astérisque (*) sur `master`"],command:"git commit",beforeCommand:"git branch newImage"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Indiquons à git que nous voulons nous positionner sur la branche avec ","","```","git checkout [nom]","```","","Cela nous positionne sur la nouvelle branche avant de faire un commit avec nos modifications"],afterMarkdowns:["C'est parti ! Nos modifications ont été enregistrées sur la nouvelle branche"],command:"git checkout newImage; git commit",beforeCommand:"git branch newImage"}},{type:"ModalAlert",options:{markdowns:["Ok! Vous êtes fin prêt pour faire des branches. Après la fermeture de cette fenêtre,","faites une nouvelle branche nommée `bugFix` et positionnez-vous sur cette branche"]}}]},zh_CN:{childViews:[{type:"ModalAlert",options:{markdowns:["## Git Branch",""," Git 的分支也非常轻量。它们只是简单地指向某个提交纪录 —— 仅此而已。所以许多 Git 爱好者传颂：","","```","早建分支！多用分支！","```","","这是因为即使创建再多分的支也不会造成储存或内存上的开销，并且按逻辑分解工作到不同的分支要比维护那些特别臃肿的分支简单多了。","","在将分支和提交记录结合起来后，我们会看到两者如何协作。现在只要记住使用分支其实就相当于在说：“我想基于这个提交以及它所有的父提交进行新的工作。”"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["咱们通过实际操作来看看分支是什么样子的。","","接下来，我们将要创建一个到名为 `newImage` 的分支。"],command:"git branch newImage",afterMarkdowns:["看到了吗，创建分支就是这么容易！新创建的分支 `newImage` 指向的是提交记录 `C1`。"],beforeCommand:""}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["现在咱们试着往新分支里提交一些东西。点击下面的按钮"],command:"git commit",afterMarkdowns:["哎呀！为什么 `master` 分支前进了，但 `newImage` 分支还待在原地呢？！这是因为我们没有“在”这个新分支上，看到 `master` 分支上的那个星号（*）了吗？这表示当前所在的分支是 `master`。"],beforeCommand:"git branch newImage"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["现在咱们告诉 Git 我们想要切换到新的分支上","","```","git checkout <name>","```","","下面的命令会让我们在提交修改之前先切换到新的分支上"],command:"git checkout newImage; git commit",afterMarkdowns:["这就对了！我们的修改已经保存到新的分支里了。"],beforeCommand:"git branch newImage"}},{type:"ModalAlert",options:{markdowns:["OK，你们都已经准备好使用分支了。当前窗口关闭后，","创建一个名为 `bugFix` 的新分支，然后切换过去。","","对了，有个更简洁的方式：如果你想创建一个新的分支同时切换到新创建的分支的话，可以通过 `git checkout -b <your-branch-name>` 来实现。"]}}]},zh_TW:{childViews:[{type:"ModalAlert",options:{markdowns:["## git 的 branch",""," git 的 branch 非常不佔空間。它們只是一個指向某個 commit 的 reference，就這麼簡單。所以許多 git 的愛好者會建議：","","```","早點建立 branch！經常建立 branch！","```","","因為建立 branch 不怎麼會佔用到硬碟空間或者是記憶體，所以你可以把你目前的工作分成好幾個 branch，這比只用一個 branch 要來的好。","","同時使用 branch 和 commit 時，我們待會可以看到兩者如何配合。現在，只要記住使用 branch 其實就是在說：「我想要包含這一次的 commit 以及它的所有 parent 的 commit。」"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["舉一個例子來看看 branch 到底是什麼。","","這裡，我們建立一個名稱為 `newImage` 的新的 branch。"],command:"git branch newImage",afterMarkdowns:["看吧！這就是建立 branch 所需的操作啦！ `newImage` branch 現在指向 commit `C1`。"],beforeCommand:""}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["現在讓我們這個新的 branch 做一些操作。點擊下面的按鈕。"],command:"git commit",afterMarkdowns:["太奇怪了啦！ `master` branch 前進了，但 `newImage` branch 沒有前進！這是因為我們沒有「在」這個新的 branch 上，這也是為什麼星號（*）會在 `master` 上。"],beforeCommand:"git branch newImage"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["使用如下指令告訴 git 我們想要切換到新的 branch","","```","git checkout [name]","```","","這可以讓我們在 commit 之前切換到新的 branch。"],command:"git checkout newImage; git commit",afterMarkdowns:["太好了！新的 branch 已經記錄了我們的修改。"],beforeCommand:"git branch newImage"}},{type:"ModalAlert",options:{markdowns:["好啦，你已經準備好使用 branch 了。當目前的視窗關閉後，","建立一個叫 `bugFix` 的新的 branch，然後切換過去。"]}}]},ko:{childViews:[{type:"ModalAlert",options:{markdowns:["## Git 브랜치","","깃의 브랜치도 놀랍도록 가볍습니다. 브랜치는 특정 커밋에 대한 참조(reference)에 지나지 않습니다. 이런 사실 때문에 수많은 Git 애찬론자들이 자주 이렇게 말하곤 합니다:","","```","브랜치를 서둘러서, 그리고 자주 만드세요","```","","브랜치를 많이 만들어도 메모리나 디스크 공간에 부담이 되지 않기 때문에, 여러분의 작업을 커다른 브랜치로 만들기 보다, 작은 단위로 잘게 나누는 것이 좋습니다.","",'브랜치와 커밋을 같이 쓸 때, 어떻게 두 기능이 조화를 이루는지 알아보겠습니다. 하지만 우선은, 단순히 브랜치를 "하나의 커밋과 그 부모 커밋들을 포함하는 작업 내역"이라고 기억하시면 됩니다.']}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["브랜치가 어떤 것인지 연습해보죠.","","`newImage`라는 브랜치를 살펴보겠습니다."],afterMarkdowns:["저 그림에 브랜치의 모든 것이 담겨있습니다! 브랜치 `newImage`가 커밋 `C1`를 가리킵니다"],command:"git branch newImage",beforeCommand:""}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["이 새로운 브랜치에 약간의 작업을 더해봅시다. 아래 버튼을 눌러주세요"],afterMarkdowns:["앗! `master` 브랜치가 움직이고, `newImage` 브랜치는 이동하지 않았네요! 그건 우리가 새 브랜치 위에 있지 않았었기 때문입니다. 별표(*)가 `master`에 있었던 것이죠."],command:"git commit",beforeCommand:"git branch newImage"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["아래의 명령으로 새 브랜치로 이동해 봅시다.","","```","git checkout [브랜치명]","```","","이렇게 하면 변경분을 커밋하기 전에 새 브랜치로 이동하게 됩니다."],afterMarkdowns:["이거죠! 이제 우리의 변경이 새 브랜치에 기록되었습니다!"],command:"git checkout newImage; git commit",beforeCommand:"git branch newImage"}},{type:"ModalAlert",options:{markdowns:["좋아요! 이제 직접 브랜치 작업을 연습해봅시다. 이 창을 닫고,","`bugFix`라는 새 브랜치를 만드시고, 그 브랜치로 이동해보세요"]}}]},ru_RU:{childViews:[{type:"ModalAlert",options:{markdowns:["## Ветвление в Git","","Ветки в Git, как и коммиты, невероятно легковесны. Это просто ссылки на определённый коммит — ничего более. Вот почему многие фанаты Git повторяют мантру","","```","делай ветки сразу, делай ветки часто","```","","Так как создание множества веток никак не отражается на памяти или жестком диске, удобнее и проще разбивать свою работу на много маленьких веток, чем хранить все изменения в одной огромной ветке.","","Чуть позже мы попробуем использовать ветки и коммиты, и вы увидите, как две эти возможности сочетаются. Можно сказать, что созданная ветка хранит изменения текущих коммитов и всех его родителей."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Посмотрим, что такое ветки на практике","","Создадим здесь новую ветку с именем newImage"],afterMarkdowns:["Вот и всё, ребята! Ветка newImage теперь указывает на коммит C1"],command:"git branch newImage",beforeCommand:""}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Теперь попробуем сделать некоторые изменения в этой ветке. Для этого нажми кнопку ниже."],afterMarkdowns:["О-оу! Ветка master сдвинулась, тогда как ветка newImage - нет! Всё из-за того, что мы не переключились на новую ветку, а остались в старой, о чём говорит звёздочка около ветки master"],command:"git commit",beforeCommand:"git branch newImage"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Сообщим Git, что хотим выбрать ветку","","```","git checkout [name]","```","","Эта команда перенесёт нас на новую ветку в момент, когда мы ещё не коммитили изменения"],afterMarkdowns:["Вот так! Наши изменения записаны уже в новую ветку"],command:"git checkout newImage; git commit",beforeCommand:"git branch newImage"}},{type:"ModalAlert",options:{markdowns:["Ну что ж, теперь ты готов к работе с ветками. Как только это окно закроется,","создай ветку с именем bugFix и переключись на неё.","","Кстати вот тебе совет, ты можешь создать новую ветку и переключиться на неё","с помощью одной команды: ```git checkout -b [yourbranchname]```."]}}]},uk:{childViews:[{type:"ModalAlert",options:{markdowns:["## Гілки в Git","","Гілки в Git також є дивовижно легкими. Вони є просто посиланнями на конкретний коміт, нічого більше. Через це багато Git-ентузіастів повторюють мантру:","","```","роби гілки завчасно, роби гілки часто","```","","Через те, що сворення нових гілок ніяк не впливає на використання пам’яті чи дискового простору, набагато простіше розділити свою роботу на кілька логічно зв’язаних по функціоналу гілок, ніж працювати з величезними гілками.","","Коли ми почнемо використовувати гілки та коміти, ми побачимо, як вони поєднуються між собою. Але зараз просто запам’ятай, що гілка просто зберігає роботу теперішнього коміту і всіх його попередників."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Давайте на практиці подивимось, як виглядають гілки в Git.","","Зараз ми створимо нову гілку `newImage`."],afterMarkdowns:["Ось і все, що треба знати про гілки. Гілка `newImage` тепер посилається на коміт `C1`."],command:"git branch newImage",beforeCommand:""}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Давайте спробуємо додати якусь інформацію до цієї нової гілки. Натисни кнопку внизу."],afterMarkdowns:['От халепа! Гілка `master` просунулася вперед, але гілка `newImage` — ні! Це тому, що ми були не "на новій гілці". Через це зірочка (*) була поруч з  `master`.'],command:"git commit",beforeCommand:"git branch newImage"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Давайте вкажемо Git, що ми хочемо перейти на нову гілку за допомогою","","```","git checkout [ім’я]","```","","Ця команда перекине нас на нову гілку до того, як ми закомітимо наші зміни."],afterMarkdowns:["Ось і все! Наші зміни були записані в нову гілку."],command:"git checkout newImage; git commit",beforeCommand:"git branch newImage"}},{type:"ModalAlert",options:{markdowns:["Тепер ти готовий до створення гілок. Як тільки це вікно пропаде, ","зроби нову гілку з назвою `bugFix` та перейди на неї."]}}]},vi:{childViews:[{type:"ModalAlert",options:{markdowns:["## Nhánh Git","","Nhánh trong Git cũng nhẹ đến không ngờ. Chúng chỉ đơn giản là các con trỏ đến commit -- không hơn. Đó là lý do các con chiên Git hay niệm chú:","","```","rẽ nhánh sớm, rẽ nhánh thường xuyên","```","","Bởi vì chẳng tốn bao nhiêu bộ nhớ cho việc rẽ nhánh cả, và nó dễ dàng phân chia công việc hơn là có một cái nhánh to tổ chảng.","",'Khi bạn trộn lẫn commit và nhánh, bạn sẽ thấy chúng kết hợp với nhau thế nào. Còn bây giờ, đơn giản hãy nhớ nhánh cơ bản muốn nói "Tôi muốn thành quả trong commit này và tất cả cha ông của nó"']}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Nào hãy xem nhánh trong Git hoạt động thế nào.","","Giờ chúng ta tạo một nhánh mới tên là `newImage`"],afterMarkdowns:["Đó, rẽ nhánh là thế đó! Nhánh `newImage` giờ đã tham chiếu đến commit `C1`"],command:"git branch newImage",beforeCommand:""}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Nào cùng thử thêm nội dung vào nhánh mới này nào. Hãy bấm nút bên dưới"],afterMarkdowns:['Ồ không! Nhánh `master` đã di chuyển nhưng nhánh `newImage` thì không! Đó là do ta không "nằm trên" nhánh mới, đó là tại sao dấu hoa thị (*) nằm trên nhánh `master`'],command:"git commit",beforeCommand:"git branch newImage"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Nào cùng bảo Git chuyển ta sang nhánh khác với lệnh","","```","git checkout <name>","```","","Lệnh này sẽ chuyển ta sang nhánh mới trước khi commit"],afterMarkdowns:["Đó! Thay đổi của ta đã được lưu sang nhánh mới"],command:"git checkout newImage; git commit",beforeCommand:"git branch newImage"}},{type:"ModalAlert",options:{markdowns:["Được rồi! Bạn đã sẵn sàng để tập rẽ nhánh rồi. Khi cửa sổ này đóng lại,","tạo một nhánh mới tên là `bugFix` và chuyển sang nhánh đó.","","Tiện thể, có đường tắt đấy: nếu bạn muốn tạo nhánh mới ","VÀ đồng thời chuyển sang luôn, bạn chỉ cần ","gõ `git checkout -b [yourbranchname]`."]}}]}}}},{}],115:[function(e,t,o){o.level={name:{en_US:"Introduction to Git Commits",de_DE:"Einführung in Git Commits",es_AR:"Introducción a los commits de Git",es_ES:"Introducción a los commits de Git",pt_BR:"Introdução aos commits no Git",gl:"Introducción ós commits de Git",fr_FR:"Introduction aux commits avec Git",ja:"Gitのコミット",ko:"Git 커밋 소개",zh_CN:"Git Commit",zh_TW:"介紹 git commit ",ru_RU:"Знакомство с Git Commit ",uk:"Знайомство з комітами в Git",vi:"Giới thiệu về Git Commit"},goalTreeString:'{"branches":{"master":{"target":"C3","id":"master"}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"},"C2":{"parents":["C1"],"id":"C2"},"C3":{"parents":["C2"],"id":"C3"}},"HEAD":{"target":"master","id":"HEAD"}}',solutionCommand:"git commit;git commit",startTree:'{"branches":{"master":{"target":"C1","id":"master"}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"}},"HEAD":{"target":"master","id":"HEAD"}}',hint:{en_US:"Just type in 'git commit' twice to finish!",de_DE:"Gib einfach zweimal 'git commit' ein um den Level abzuschließen",es_AR:"¡Simplemente tipeá 'git commit' dos veces para terminar!",es_ES:"¡Simplemente escribe 'git commit' dos veces para terminar!",pt_BR:"Simplesmente digite 'git commit' duas vezes para concluir!",gl:"Simplemente escribe 'git commit' dúas veces para terminar.",fr_FR:"Il suffit de saisir 'git commit' deux fois pour réussir !",zh_CN:"执行两次 'git commit' 就可以过关了！",zh_TW:"輸入兩次 'git commit' 就可以完成！",ja:"'git commit'コマンドを2回打てば完成!",ko:"'git commit'이라고 두 번 치세요!",ru_RU:"Попробуй дважды выполнить команду 'git commit' ;)",uk:"Спробуй двічі виконати команду 'git commit' ;)",vi:"Đơn giản là cứ gõ 'git commit' 2 lần"},disabledMap:{"git revert":!0},startDialog:{en_US:{childViews:[{type:"ModalAlert",options:{markdowns:["## Git Commits","A commit in a git repository records a snapshot of all the files in your directory. It's like a giant copy and paste, but even better!","",'Git wants to keep commits as lightweight as possible though, so it doesn\'t just blindly copy the entire directory every time you commit. It can (when possible) compress a commit as a set of changes, or a "delta", from one version of the repository to the next.',"","Git also maintains a history of which commits were made when. That's why most commits have ancestor commits above them -- we designate this with arrows in our visualization. Maintaining history is great for everyone working on the project!","","It's a lot to take in, but for now you can think of commits as snapshots of the project. Commits are very lightweight and switching between them is wicked fast!"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Let's see what this looks like in practice. On the right we have a visualization of a (small) git repository. There are two commits right now -- the first initial commit, `C0`, and one commit after that `C1` that might have some meaningful changes.","","Hit the button below to make a new commit"],afterMarkdowns:["There we go! Awesome. We just made changes to the repository and saved them as a commit. The commit we just made has a parent, `C1`, which references which commit it was based off of."],command:"git commit",beforeCommand:""}},{type:"ModalAlert",options:{markdowns:["Go ahead and try it out on your own! After this window closes, make two commits to complete the level"]}}]},de_DE:{childViews:[{type:"ModalAlert",options:{markdowns:["## Git Commits","Ein Commit in ein Git-Repository speichert einen Abbildung aller Dateien in deinem Projektverzeichnis. Es ist wie ein riesiges Kopieren und Einfügen, nur besser.","","Allerdings will Git die Commits so schlank wie möglich halten, also kopiert es nicht einfach stur das ganze Verzeichnis jedes Mal wenn du committest. Es kann (wenn möglich) Commits als Menge von Änderungen zusammenpacken, von einer Version des Repositorys zur nächsten.","","Außerdem führt Git ein Protokoll darüber welche Commits wann gemacht wurden, und welcher auf welchen folgt. Deshalb werden die Commits hier mit ihrem Vorgänger über sich gezeigt -- wir verwenden Pfeile zur Darstellung der Beziehung. Dieses Protokoll zu haben ist eine tolle Sache für jeden, der an einem Projekt arbeitet.","","Das war jetzt eine Menge Neues, aber vorerst kannst du dir Commits einfach als Abbildungen des Projekts vorstellen. Commits sind sehr ressourcenschonend, und zwischen ihnen wechseln geht superschnell!"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Mal sehen wie das in der Praxis ist. Rechts sehen wir ein (kleines) Git-Repository. Es gibt aktuell zwei Commits -- den initialen, `C0`, und den danach, `C1`, der irgendwelche Änderungen enthält.","","Klick die Schaltfläche unten um einen neuen Commit zu erzeugen:"],afterMarkdowns:["Fertig. Klasse! Wir haben gerade Änderungen gemacht und als Commit im Repository gespeichert. Der Commit, den wir gerade gemacht haben, hat den Vorgänger `C1`; der verweist wiederum auf den Commit, auf dem er basiert: `C0`."],command:"git commit",beforeCommand:""}},{type:"ModalAlert",options:{markdowns:["Probier das committen gleich mal aus! Mach zwei Commits um den Level abzuschließen."]}}]},ja:{childViews:[{type:"ModalAlert",options:{markdowns:["## Gitのコミット","コミットによって、ディレクトリ中の全てのファイルのスナップショットを記録します。巨大なコピー＆ペーストのようなものですが、実際にはそれよりずっと良いものです。","","Gitではコミットを可能な限り軽量に保つために、コミット毎にフォルダ全体をコピーしません。実際にはGitは、コミットを直前のバージョンから一つ先のバージョンへの「変更の固まり」あるいは「差分」として記録します。後で出てきますが、ほとんどのコミットが親を持っているのはそういう理由からです。","","リポジトリをcloneする時には、内部動作としてはコミットの差分をたどって全ての変更を取得しています。cloneした時に以下のような表示が出るのは：","","`resolving deltas`（訳：差分を解決中）","","このためです。","","もっと説明したいところですが、しばらくはコミットをスナップショットのようなものだと考えてください。コミットは非常に軽量であり、コミット間の移動も非常に高速です。"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["これがどういうことか、動きを見ていきましょう。図には（小さな）gitリポジトリが描かれています。コミットが2つあります -- `C0`という名前の初回のコミットがあり、`C1`という名前の次のコミットが続きます。これは何か意味のある変更かもしれません。","","下のボタンを押下して新しいコミットを作ってみましょう。"],afterMarkdowns:["できました! 良いですね。いまリポジトリに新しい変更が加えられ、1つのコミットとして保存されました。作成したコミットには親がいて、このコミットの出発点となった`C1`を指しています。"],command:"git commit",beforeCommand:""}},{type:"ModalAlert",options:{markdowns:["実際に手を動かしてみましょう。このウィンドウを閉じたら、試しに2回コミットをしてみましょう。"]}}]},es_AR:{childViews:[{type:"ModalAlert",options:{markdowns:["## Commits de Git","Un commit en un repositorio git registra un snapshot de todos los archivos en tu directorio. Es como un _gran_ copy&paste, ¡pero incluso mejor!","",'Git pretende mantener los commits tan livianos como sea posible, por lo que no copia ciegamente el directorio completo cada vez que commiteás. Puede (cuando sea posible) comprimir un commit como un conjunto de cambios (o un _"delta"_) entre una versión de tu repositorio y la siguiente.',"","Git mantiene, también, un historial de qué commits se hicieron cuándo. Es por eso que la mayoría de los commits tienen commits ancestros arriba suyo -- designamos esto con flechas en nuestra visualización. ¡Mantener el historial es genial para todos los que trabajan en el proyecto!","","Hay un montón en lo que ahondar, pero por ahora podés pensar en los commits como snapshots de tu proyecto. Los commits son muy livianos, y ¡cambiar de uno a otro es terriblemente rápido!"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Veamos cómo se ve esto en la práctica. A la derecha tenemos una visualización de un (pequeño) repositorio git. Hay dos commits ahora: el commit inicial, `C0`, y un commit que lo sigue, `C1`, que podría tener algunos cambios interesantes.","","Dale al botón de abajo para hacer un nuevo commit"],afterMarkdowns:["¡Ahí va! Increíble. Acabamos de hacer cambios al repositorio y los guardamos como un commit. El commit que acabamos de crear tiene un padre, `C1`, que referencia al commit en que se basó este."],command:"git commit",beforeCommand:""}},{type:"ModalAlert",options:{markdowns:["¡Dale, intentalo vos ahora! Cuando se cierre esta ventana, hacé dos commits para completar el nivel."]}}]},es_ES:{childViews:[{type:"ModalAlert",options:{markdowns:["## Commits de Git","Un commit en un repositorio git registra un snapshot de todos los archivos en tu directorio. Es como un _gran_ copy&paste, ¡pero incluso mejor!","",'Git pretende mantener los commits tan livianos como sea posible, por lo que no copia ciegamente el directorio completo cada vez que haces un commit. Puede (cuando es posible) comprimir un commit como un conjunto de cambios (o un _"delta"_) entre una versión de tu repositorio y la siguiente.',"","Git mantiene, también, un historial de qué commits se hicieron y cuándo. Es por eso que la mayoría de los commits tienen commits ancestros encima -- designamos esto con flechas en nuestra visualización. ¡Mantener el historial es genial para todos los que trabajan en el proyecto!","","Hay un montón en lo que ahondar, pero por ahora puedes pensar en los commits como snapshots de tu proyecto. Los commits son muy livianos, y ¡cambiar de uno a otro es terriblemente rápido!"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Veamos cómo se ve esto en la práctica. A la derecha tenemos una visualización de un (pequeño) repositorio git. Hay dos commits: el commit inicial, `C0`, y un commit que lo sigue, `C1`, que podría tener algunos cambios interesantes.","","Dale al botón de abajo para crear un nuevo commit"],afterMarkdowns:["¡Allá va! Increíble. Acabamos de hacer cambios al repositorio y los guardamos como un commit. El commit que acabamos de crear tiene un padre, `C1`, que referencia al commit en el que se basó este."],command:"git commit",beforeCommand:""}},{type:"ModalAlert",options:{markdowns:["¡Venga, inténtalo ahora! Cuando se cierre esta ventana, crea dos commits para completar el nivel."]}}]},pt_BR:{childViews:[{type:"ModalAlert",options:{markdowns:["## Commits no Git","Um commit em um repositório git registra uma fotografia (snapshot) de todos os arquivos no seu diretório. É como um _grande_ copy&paste, mas ainda melhor!","",'O Git tem por objetivo manter os commits tão leves quanto possível, de forma que ele não copia cegamente o diretório completo toda vez que você commita. Ele pode (quando possível) comprimir um commit como um conjunto de mudanças (ou um _"delta"_) entre uma versão do seu repositório e a seguinte.',"","O Git também mantém um histórico de quando ocorreu cada commit. É por isso que a maioria dos commits tem ancestrais acima de si -- que indicamos usando setas na nossa visualização. Manter a história é ótimo para todos que trabalham no projeto!","","Há muito para aprender, mas por enquanto pense nos commits como snapshots do seu projeto. Os commits são muito leves, e mudar de um para outro é extremamente rápido!"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Vejamos o que isso significa na prática. À direita, temos uma visualização de um (pequeno) repositório git. Há dois commits no momento: o commit inicial, `C0`, e um commit que se segue, `C1`, que poderia conter algumas mudanças interessantes.","","Clique no botão abaixo para fazer um novo commit"],afterMarkdowns:["Aí vamos nós! Incrível. Acabamos de fazer mudanças no repositório e as guardamos como um commit. O commit que acabamos de criar tem um pai, `C1`, que referencia em qual commit ele se baseou."],command:"git commit",beforeCommand:""}},{type:"ModalAlert",options:{markdowns:["Vamos lá, tente você agora! Quando esta janela se fechar, faça dois commits para completar o nível."]}}]},gl:{childViews:[{type:"ModalAlert",options:{markdowns:["## Commits en Git","Un commit nun repositorio de git rexistra unha fotografía (snapshot) de tódolos arquivos no seu directorio. É coma un copy&paste xigante, ¡pero todavía mellor!","",'Git quere gardar os commits o máis pequenos posíbel, por iso non copia directamente o directorio completo sempre que fas un commit. El pode (cando é posíbel) comprimir nun commit un conxunto de cambios (ou un _"delta"_) entre unha versión do teu respositorio e o seguinte.',"","Git tamén garda un histórico de cando se fixo cada cambio. Por iso a maioría dos commits teñen ancestros enriba deles, e nos indicámolos con frechas na nosa visualización. ¡Manter a historia é óptimo para tódolos que traballan no proxecto!","","Hai moito que aprender, pero por agora podes pensar que os commits son fotos do teu proxecto. Os commits son liviáns, e cambiar dun para o outro é extremadamente rápido!"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Vexamos o que iso significa na práctica. Á dereita, temos unha visualización dun (pequeno) repositorio de git. Hai dous commits por agora: o commit inicial, `C0`, e un commit que lle segue, `C1`, que podería ter algúns cambios interesantes.","","Pincha no botón de abaixo para facer un novo commit"],afterMarkdowns:["¡Alá imos! Mi ma!. Fixemos cambios no repositorio e gardámolos nun commit. O commit que creaches ten un pai, `C1`, que é unha referencia do commit no que se basea."],command:"git commit",beforeCommand:""}},{type:"ModalAlert",options:{markdowns:["Alá imos. ¡Inténtao ti agora! Cando se peche a ventá, fai dous commits para completar o nivel."]}}]},fr_FR:{childViews:[{type:"ModalAlert",options:{markdowns:["## Commits Git","Un commit dans un dépôt (repository) git enregistre une image (snapshot) de tous les fichiers du repertoire. Comme un Copier-Coller géant, mais en bien mieux !","","Git fait en sorte que les commits soient aussi légers que possible donc il ne recopie pas tout le répertoire à chaque commit. En fait, git n'enregistre que l'ensemble des changements (\"delta\") depuis la version précédente du dépôt. C'est pour cette raison que la plupart des commits ont un commit parent -- ainsi que nous le verrons plus tard.","",'Pour cloner un dépôt, il faut décompresser ("résoudre") tous ces deltas. C\'est la raison pour laquelle la commande écrit :',"","`resolving deltas`","","lorsque l'on clone un dépôt.","","C'est beaucoup à absorber, mais pour l'instant vous pouvez considérer les commits comme des snapshots du projet. Les commits sont très légers et passer de l'un à l'autre est très rapide !"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Voyons à quoi cela ressemble en pratique. Sur la droite, on peut visualiser un (petit) dépôt git. Il y a pour l'instant deux commits -- le premier commit initial, `C0`, et un commit suivant `C1` qui aurait des changements significatifs.","","Appuyez sur le bouton ci-dessous pour faire un nouveau commit"],afterMarkdowns:["C'est parti ! Super. Nous venons de faire des modifications sur le dépôt et de sauvegarder celles-ci dans un commit. Ce commit que nous venons de faire a un parent, `C1`, qui référence le commit sur lequel il est basé."],command:"git commit",beforeCommand:""}},{type:"ModalAlert",options:{markdowns:["Allez-y et essayez par vous-même ! Après la fermeture de cette fenêtre, faites deux commits pour terminer ce niveau."]}}]},ko:{childViews:[{type:"ModalAlert",options:{markdowns:["## Git 커밋","커밋은 Git 저장소에 여러분의 디렉토리에 있는 모든 파일에 대한 스냅샷을 기록하는 것입니다. 디렉토리 전체를 복사하여 붙여넣는것과 유사하지만, 훨씬 유용한 방법입니다!","",'Git은 가능한 한 커밋을 가볍게 유지하고자 하기때문에, 커밋할 때마다 디렉토리 전체를 복사하진 않습니다. 각 커밋은 저장소의 이전 버전과 다음 버전의 변경내역("delta"라고도 함)을 저장합니다. 그래서 대부분의 커밋이 그 커밋 위의 부모 커밋을 가리킵니다. -- 다음 화면에서 곧 살펴보게 될 것입니다.',"","저장소를 복제(clone)하려면 모든 변경분(delta)를 풀어내야 하는데, 이 때문에 명령행 결과로 아래 문구를 볼 수 있습니다.","","`resolving deltas`","","알아야 할 것이 꽤 많습니다만, 일단은 커밋을 프로젝트의 스냅샷들로 생각하면 충분합니다. 커밋은 매우 가볍고 커밋 사이의 전환도 매우 빠르다는 것을 기억해주세요!"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["연습할 때 어떻게 보이는지 확인해봅시다. 오른쪽 화면에 git 저장소를 그림으로 표현해 놓았습니다. 현재 두번 커밋한 상태입니다 -- 첫번째 커밋으로 `C0`, 그 다음으로 `C1`이라는 어떤 의미있는 변화가 있는 커밋이 있습니다.","","아래 버튼을 눌러 새로운 커밋을 만들어보세요."],afterMarkdowns:["이렇게 보입니다! 멋지죠. 우리는 방금 저장소 내용을 변경해서 하나의 커밋으로 저장했습니다. 방금 만든 커밋은 부모는 `C1`이고, 어떤 커밋을 기반으로 변경된 것인지를 가리킵니다."],command:"git commit",beforeCommand:""}},{type:"ModalAlert",options:{markdowns:["계속해서 직접 한번 해보세요! 이 창을 닫고, 커밋을 두 번 하면 다음 레벨로 넘어갑니다."]}}]},zh_CN:{childViews:[{type:"ModalAlert",options:{markdowns:["## Git Commit","Git 仓库中的提交记录保存的是你的目录下所有文件的快照，就像是把整个目录复制，然后再粘贴一样，但比复制粘贴优雅许多！","","Git 希望提交记录尽可能地轻量，因此在你每次进行提交时，它并不会盲目地复制整个目录。条件允许的情况下，它会将当前版本与仓库中的上一个版本进行对比，并把所有的差异打包到一起作为一个提交记录。","","Git 还保存了提交的历史记录。这也是为什么大多数提交记录的上面都有父节点的原因 —— 我们会在图示中用箭头来表示这种关系。对于项目组的成员来说，维护提交历史对大家都有好处。","","关于提交记录太深入的东西咱们就不再继续探讨了，现在你可以把提交记录看作是项目的快照。提交记录非常轻量，可以快速地在这些提交记录之间切换！"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["咱们来实际操作一下，看看提交记录是怎样的。右边展示了一个（小型）Git 代码库。当前有两个提交记录 —— 初始提交 `C0` 和其后可能包含某些有用修改的提交 `C1`。","","点击下面的按钮创建一个新的提交记录。"],afterMarkdowns:["好了！非常棒！我们刚才修改了代码库，并把这些修改保存成了一个提交记录 `C2`。`C2` 的父节点是 `C1`，父节点是当前提交中变更的基础。"],command:"git commit",beforeCommand:""}},{type:"ModalAlert",options:{markdowns:["接下来自己试一试吧。当前窗口关闭后，完成两次提交就可以过关！"]}}]},zh_TW:{childViews:[{type:"ModalAlert",options:{markdowns:["## git commit","一個 commit 在 git repo 中會記錄目錄下所有文件的快照。感覺像是大量的複製和貼上，但 git 的速度更快！","",'git 希望 commit 儘可能地不占空間，所以每次進行 commit 的時候，它不會單純地複製整個目錄。實際上它把每次 commit 視為從目前的版本到下一個版本的變化量，或者說一個 "（delta）"。',"","git 會保存 commit 的歷史紀錄，所以，絕大部分的 commit 的上面都會有 parent commit，在我們的圖形表示中，箭頭方向表示從 parent commit 到所對應的 child commit，保存這樣子的一個歷史紀錄是非常有用的。","","要學的東西有很多，但現在你可以把 commit 當作是當下的 project 的快照。commit 不佔空間且可以快速切換！"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["在實例中學習 commit。右邊是一個（小）git repository。當前有兩個 commit，一開始的 commit `C0` 以及 `C1` 這一個 commit 來表示之後可能的一些修改。","","點擊下面的按鈕生成新的 commit。"],command:"git commit",afterMarkdowns:["看吧！很厲害！我們對於文件做了一些修改，並且把這些修改表示成一個 commit。剛剛做的 commit `C2` 有一個 parent commit `C1`，代表此次修改是從那裡過來的。"],beforeCommand:""}},{type:"ModalAlert",options:{markdowns:["接下來你可以隨便測試。當目前的視窗關閉之後，輸入兩次 commit 就可以過關！"]}}]},ru_RU:{childViews:[{type:"ModalAlert",options:{markdowns:["## Коммиты в GIT","Коммит в git репозитории хранит снимок всех файлов в директории. Почти как огромная копия, только лучше","","Git пытается быть лёгким и быстрым насколько это только возможно, так что он не просто слепо копирует всю директорию каждый раз, а ужимает (когда это возможно) коммит в набор изменений или «дельту» между текущей версией и предыдущей.","","Также Git хранит всю историю о том, когда какой коммит был сделан. Вот почему большинство коммитов имеют предков - мы указываем на предков стрелками при визуализации. Поддержка истории коммитов более чем важна для всех, кто работает над проектом!","","Можно ещё долго рассказывать о коммитах, но для простоты будем считать их полными снимками проекта. Коммиты очень легки, так что переключение между ними происходит предельно быстро!"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Посмотрим, как это выглядит на практике. Справа расположена визуализация небольшого git репозитория. Сейчас в нём два коммита: первый, исходный коммит С0 и один коммит С1 после него, содержащий изменения.","","Нажми на кнопку, чтобы совершить коммит"],afterMarkdowns:["Отлично. Мы только что внесли изменения в репозиторий и сохранили их как коммит. У коммита, который мы только что сделали, есть родитель, С1, который указывает на предыдущий коммит."],command:"git commit",beforeCommand:""}},{type:"ModalAlert",options:{markdowns:["Пора попробовать! После того, как это окно закроется, сделай два коммита, чтобы пройти этот уровень."]}}]},uk:{childViews:[{type:"ModalAlert",options:{markdowns:["## Коміти в Git","Коміт в Git репозиторії зберігає моментальну копію всіх файлів в поточній директорії. Це як гігантська копіпаста, тільки краще.","",'Git намагається зберігати коміти якнайпростіше й ефективніше, тому він не просто копіює всю директорію при кожному коміті. Він може стиснути коміт в набір правок чи "дельту" між двома версіями репозиторію.',"","Git також зберігає історію коли і ким був створений той чи інший коміт. Тому більшість комітів мають комітів-предків, що знаходяться вище в ієрархії — ми це зображуємо стрілочками в нашій візуалізації. Історія — це необхідна річ для кожного, хто працює з конкретним проектом.","","Тут є багато над чим подумати, але наразі ти можеш уявляти коміти як моментальні знімки проекту. Коміти майже невагомі й перемикання між ними дуже швидке."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Давай подивимось, як це виглядає на практиці. Справа зображена візуалізація маленького Git-репозиторію. Наразі ми бачимо два коміти: початковий коміт `C0`, та наступний коміт `C1`, який містить якісь змістовні зміни.","","Натисни кнопку нижче, щоб створити новий коміт."],afterMarkdowns:["Чудово. Ми щойно зробили деякі зміни з репозиторієм і зберегли їх як новий коміт. Цей коміт має предка `C1`, який вказує на коміт, з якого він був створений."],command:"git commit",beforeCommand:""}},{type:"ModalAlert",options:{markdowns:["Спробуй сам. Після того як це вікно закриється, зроби два коміти, щоб пройти цей рівень."]}}]},vi:{childViews:[{type:"ModalAlert",options:{markdowns:["## Git Commits","Một commit trong một git repository(kho chứa) lưu trữ một ảnh chụp của tất cả các file trong thư mục của bạn. Như kiểu copy và paste cõ bự, thậm chí còn tốt hơn thế!","",'Thế nhưng Git muốn giữ cho các commit nhẹ hết mức có thể, cho nên git không copy tất cả thư mục một cách mù quáng mỗi khi bạn commit. Nó có thể(khi khả dĩ) nén commit như một tập hợp các thay đổi, hay là một "bản so sánh", giũa một phiên bản kho chứa git với phiên bản tiếp theo.',"","Đồng thời Git cũng lưu trữ lịch sử commit nào được tạo ra lúc nào. Đó là tại sao hầu hết các commit có commit tổ tiên phía trên nó -- chúng tôi đã hình tượng hóa mối quan hệ này bằng các mũi tên. Trong cộng tác nhóm thì việc gìn giữ lịch sử là rất có ích!","","Có vẻ là hơi nhiều lý thuyết rồi, bây giờ bạn chỉ cần hiều các commit là các lát cắt của dự án. Các commit rất nhẹ nên việc chuyển qua lại giữa chúng thì nhanh vô cùng!"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Thử thực hành chút nào. Ở bên phải chúng ta có mô tả một kho git (nhỏ). Hiện tại đang có 2 commit, một là commit khởi nguyên `C0`, và một commit sau đó `C1` có thể đã có một vài thay đổi.","","Bấm nút bên dưới để tạo một commit mới"],afterMarkdowns:["Đúng rồi! Tuyệt vời. Bạn vừa tạo thay đổi cho kho chứa và lưu vào commit. Cái commit bạn vừa tạo nó có cha, là `C1` đấy, là commit mà nó được tạo ra từ đó."],command:"git commit",beforeCommand:""}},{type:"ModalAlert",options:{markdowns:["Nào bây giờ thì thử tự làm bài tập nào! Sau khi đóng cửa sổ này, tạo ra 2 commit để hoàn thành cấp độ"]}}]}}}},{}],116:[function(e,t,o){o.level={goalTreeString:'{"branches":{"master":{"target":"C4","id":"master"},"bugFix":{"target":"C2","id":"bugFix"}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"},"C2":{"parents":["C1"],"id":"C2"},"C3":{"parents":["C1"],"id":"C3"},"C4":{"parents":["C3","C2"],"id":"C4"}},"HEAD":{"target":"master","id":"HEAD"}}',solutionCommand:"git checkout -b bugFix;git commit;git checkout master;git commit;git merge bugFix",name:{en_US:"Merging in Git",de_DE:"Mergen in git",es_AR:"Mergeando en Git",es_ES:"Haciendo merge en Git",pt_BR:"Merge no Git",gl:"Merge en Git",fr_FR:"Faire des 'merge' (fusions de branches) avec Git",ko:"Git에서 브랜치 합치기(Merge)",ja:"ブランチとマージ",zh_CN:"Git Merge",zh_TW:"git 中的 merge",ru_RU:"Слияния веток в Git",uk:"Злиття гілок в Git",vi:"Gộp nhánh trong Git"},hint:{en_US:"Remember to commit in the order specified (bugFix before master)",de_DE:"Denk dran in der angegebenen Reihenfolge zu committen (erst bugFix, dann master)",ja:"指示された順番でコミットすること（masterの前にbugFixで）",es_AR:"Acordate de commitear en el orden especificado (bugFix antes de master)",es_ES:"Acuérdate de hacer commit en el orden especificado (bugFix antes de master)",pt_BR:"Lembre-se de commitar na ordem especificada (bugFix antes de master)",gl:"Lembrate de facer commit na orde específica (bugFix antes de master)",fr_FR:"Pensez à faire des commits dans l'ordre indiqué (bugFix avant master)",zh_CN:"要按目标窗口中指定的顺序进行提交（bugFix 先于 master）",zh_TW:"記住按指定的順序 commit（bugFix 比 master 優先）",ko:"말씀드린 순서대로 커밋해주세요 (bugFix에 먼저 커밋하고 master에 커밋)",ru_RU:"Не забудь делать коммиты в правильном порядке (сначала bugFix, потом master)",uk:"Не забудь робити коміти в правильному порядку (спочатку bugFix, а вже потім master)",vi:"Nhớ là commit theo đúng thứ tự(bugFix trước master)"},disabledMap:{"git revert":!0},startDialog:{en_US:{childViews:[{type:"ModalAlert",options:{markdowns:["## Branches and Merging","","Great! We now know how to commit and branch. Now we need to learn some kind of way of combining the work from two different branches together. This will allow us to branch off, develop a new feature, and then combine it back in.","",'The first method to combine work that we will examine is `git merge`. Merging in Git creates a special commit that has two unique parents. A commit with two parents essentially means "I want to include all the work from this parent over here and this one over here, *and* the set of all their parents."',"","It's easier with visuals, let's check it out in the next view"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Here we have two branches; each has one commit that's unique. This means that neither branch includes the entire set of \"work\" in the repository that we have done. Let's fix that with merge.","","We will `merge` the branch `bugFix` into `master`"],afterMarkdowns:["Woah! See that? First of all, `master` now points to a commit that has two parents. If you follow the arrows up the commit tree from `master`, you will hit every commit along the way to the root. This means that `master` contains all the work in the repository now.","","Also, see how the colors of the commits changed? To help with learning, I have included some color coordination. Each branch has a unique color. Each commit turns a color that is the blended combination of all the branches that contain that commit.","","So here we see that the `master` branch color is blended into all the commits, but the `bugFix` color is not. Let's fix that..."],command:"git merge bugFix",beforeCommand:"git checkout -b bugFix; git commit; git checkout master; git commit"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Let's merge `master` into `bugFix`:"],afterMarkdowns:["Since `bugFix` was an ancestor of `master`, git didn't have to do any work; it simply just moved `bugFix` to the same commit `master` was attached to.","","Now all the commits are the same color, which means each branch contains all the work in the repository! Woohoo!"],command:"git checkout bugFix; git merge master",beforeCommand:"git checkout -b bugFix; git commit; git checkout master; git commit; git merge bugFix"}},{type:"ModalAlert",options:{markdowns:["To complete this level, do the following steps:","","* Make a new branch called `bugFix`","* Checkout the `bugFix` branch with `git checkout bugFix`","* Commit once","* Go back to `master` with `git checkout`","* Commit another time","* Merge the branch `bugFix` into `master` with `git merge`","",'*Remember, you can always re-display this dialog with "objective"!*']}}]},de_DE:{childViews:[{type:"ModalAlert",options:{markdowns:["## Branches und Mergen","","Super! Wir wissen jetzt, wie man committet und einen Branch anlegt. Jetzt müssen wir nur noch rauskriegen, wie man die Arbeit, die in verschiedenen Branches steckt, zusammenführen kann. Dann können wir einen neuen Branch erstellen, darin ein neues Feature entwickeln, und das dann in den ursprünglichen Branch integrieren.","",'Die einfachste Methode, mit der man Branches zusammenführen kann, ist `git merge`. Das Mergen erzeugt in git einen speziellen Commit, der zwei Vorgänger hat. Ein solcher Commit bedeutet im Prinzip "ich möchte alle Arbeit von dem Vorgänger hier und dem dort *und* allen ihren jeweiligen Vorgängern miteinander kombinieren".',"","Grafisch dargestellt ist es einfacher zu verstehen, lass es uns mal ansehen"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Hier haben wir zwei Branches; jeder besteht jeweils aus einem eigenen Commit. Das bedeutet, dass keiner der beiden Branches alle Inhalte des gesamten Repositorys kennt. Das werden wir mit einem Merge ändern.","","Wir werden den Branch `bugFix` in `master` integrieren"],afterMarkdowns:["Wow! Hast du das gesehen? Zunächst mal zeigt `master` jetzt auf einen Commit mit zwei Vorgängern. Wenn du den beiden Pfeilen immer weiter folgst, kommst du an jedem Commit im Repository vorbei. Das heißt `master` enthält jetzt alles, was es im Repository gibt.","","Siehst du außerdem wie sich die Farben der Commits verändert haben? Um die Vorgänge zu verdeutlichen hab ich etwas Farbe ins Spiel gebracht. Jeder Branch hat seine eindeutige Farbe. Jeder Merge Commit bekommt als Farbe eine Mischung aus den Farben seiner Vorgänger.","","Wir sehen also, dass die Farbe des Branch `master` in alle Commits gemischt wurde, die von `bugFix` aber nicht. Ändern wir das ..."],command:"git merge bugFix",beforeCommand:"git checkout -b bugFix; git commit; git checkout master; git commit"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Mergen wir `master` in `bugFix`:"],afterMarkdowns:["Da `bugFix` ein Vorgänger von `master` war, musste git hier kaum etwas tun; es verschiebt `bugFix` einfach auf den Commit, auf den auch `master` zeigt.","","Jetzt haben alle Commits dieselbe Farbe, das heißt jeder Branch enthält die Informationen des gesamten Repositorys! Juhu!"],command:"git checkout bugFix; git merge master",beforeCommand:"git checkout -b bugFix; git commit; git checkout master; git commit; git merge bugFix"}},{type:"ModalAlert",options:{markdowns:["Führe folgendes aus, um diesen Level zu schaffen:","","* Lege einen neuen Branch `bugFix` an","* Checke `bugFix` aus mittels `git checkout bugFix`","* Mach einen Commit","* Geh mit `git checkout` zum `master` zurück","* Mach noch einen Commit","* Merge den Branch `bugFix` in `master` mit `git merge`","","*Denk dran, du kannst diese Meldung mit dem Befehl `objective` so oft anzeigen, wie du willst!*"]}}]},ja:{childViews:[{type:"ModalAlert",options:{markdowns:["## ブランチとマージ","","いい調子ですね。これまでにコミットとブランチについて学びました。そろそろ2つのブランチを1つにまとめるやり方について見ていきましょう。これができれば新しい機能の開発のために新しいブランチを切って、開発が終わったら変更を元のブランチへ統合することができるようになります。","","はじめに紹介するのは、`git merge`を使ったマージのやり方です。mergeコマンドによって、2つの独立した親を持つ特別なコミットを作ることができます。2つの親を持つコミットが持つ意味とは、「全く別々の場所にいる2つの親（*かつ*、それらの親の祖先全て）が持つ全ての変更を含んでいますよ」ということです。","","見てみた方が早いので、次の画面で確認してみましょう。"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["それぞれ別のコミットを指している2つのブランチがあります。変更が別々のブランチに分散していて統合されていないケースです。これをマージで1つにまとめてみましょう。","","`bugFix`ブランチを`master`ブランチにマージしてみます。"],afterMarkdowns:["わあ、見ましたか？まず初めに、`master`ブランチが2つのコミットを親に持つ新しいコミットを指してますね。`master`から親をたどっていくと、最も古いコミットにたどり着くまでに全てのコミットを含んでいる様が確認できます。これで、全ての変更を含む`master`が完成しました。","","色がどう変わったかにも注目して下さい。学習を助けるために、ブランチ毎に色をつけています。それぞれのブランチは自分の色を持っていて、どのブランチから派生して出てくるか次第でコミットごとの色が決まります。","","今回のコミットには`master`ブランチの色が使われました。しかし`bugFix`ブランチの色がまだ変わってないようなので、これを変えてみましょう。"],command:"git merge bugFix",beforeCommand:"git checkout -b bugFix; git commit; git checkout master; git commit"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["`master`ブランチを`bugFix`ブランチにマージしてみます。"],afterMarkdowns:["`bugFix`ブランチは`master`ブランチの派生元だったので、gitは実際大したことはしていません。`bugFix`ブランチを指していたポインタを`master`が指していたコミットへと移動させただけです。","","これで全てのコミットが同じ色になりました。つまり、リポジトリの中の全ての変更をそれぞれのブランチが持ったことになります。やったね！"],command:"git checkout bugFix; git merge master",beforeCommand:"git checkout -b bugFix; git commit; git checkout master; git commit; git merge bugFix"}},{type:"ModalAlert",options:{markdowns:["以下の作業で理解度の確認をしてみましょう:","","* `bugFix`という名前で新しいブランチを切る","* `git checkout bugFix`コマンドで`bugFix`ブランチに切り替える","* 一回だけコミット","* `git checkout`で`master`へ戻る","* もう1回コミットする","* `git merge`コマンドを使って、`bugFix`ブランチを`master`ブランチへとマージする","",'*注："objective"コマンドでこのヘルプにいつでも戻ってこれます*']}}]},es_AR:{childViews:[{type:"ModalAlert",options:{markdowns:["## Mergeando ramas","","¡Genial! Ya sabemos cómo commitear y cómo crear ramas. Ahora tenemos que aprender algún modo de unificar el trabajo de dos ramas diferentes.  Esto nos va a permitir abrir una nueva rama de desarrollo, implementar alguna nueva funcionalidad, y después unirla de nuevo con el trabajo principal.","",'El primer método para combinarlas que vamos a explorar es `git merge`. Mergear en Git crea un commit especial que tiene dos padres diferentes. Un commit con dos padres esencialmente significa "Quiero incluir todo el trabajo de este padre de acá y este otro padre de acá, *y* del conjunto de todos sus ancestros"',"","Es más simple visualizarlo, veámoslo a continuación"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:['Acá tenemos dos ramas, y cada una tiene un commit que le es único. Esto significa que ninguna de las ramas incluye "todo el trabajo" que hay en nuestro repositorio. Hagamos un merge para solucionar eso.',"","Vamos a `merge`ar la rama `bugFix` a `master`"],afterMarkdowns:["¡Wooow! ¿Viste eso? Primero que nada, `master` ahora apunta a un commit que tiene dos padres. Si seguís las flechas por el árbol de commits empezando desde `master` vas a cruzarte con cada commit del repositorio hasta llegar a la raíz. Esto significa que `master` ahora contiene todo el trabajo que hay en el repositorio.","","Además, ¿viste cómo cambiaron los colores de los commits? Para ayudar al aprendizaje, incluí algunas convenciones de colores. Cada rama tiene un color propio. Cada commmit se vuelve del color resultante de mezclar los colores de todas las ramas que lo contienen.","","Así que acá vemos que el color de la rama `master` participa en la mezcla de todos los commits, pero que el de `bugFix` no. Arreglemos eso..."],command:"git merge bugFix",beforeCommand:"git checkout -b bugFix; git commit; git checkout master; git commit"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Mergeemos `master` a `bugFix`:"],afterMarkdowns:["Como `bugFix` era un ancestro de `master`, git no tuvo que hacer ningún trabajo; simplemente movió `bugFix` al mismo commit al que estaba anexado `master`.","","Ahora todos los commits son del mismo color, lo que significa que cada rama contiene todo el trabajo que hay en el repositorio. ¡Wiii!"],command:"git checkout bugFix; git merge master",beforeCommand:"git checkout -b bugFix; git commit; git checkout master; git commit; git merge bugFix"}},{type:"ModalAlert",options:{markdowns:["Para completar este nivel, seguí estos pasos:","","* Creá una nueva rama, llamada `bugFix`","* Checkouteá la rama `bugFix` usando `git checkout bugFix`","* Hacé un commit","* Volvé a `master` con `git checkout`","* Hacé otro commit","* Mergeá la rama `bugFix` a `master` usando `git merge`","",'*Acordate: siempre podés volver a ver este mensaje tipeando "objective"!*']}}]},es_ES:{childViews:[{type:"ModalAlert",options:{markdowns:["## Haciendo merge en ramas","","¡Genial! Ya sabemos cómo crear un commit y cómo crear ramas. Ahora tenemos que aprender algún modo de unificar el trabajo de dos ramas diferentes.  Esto nos va a permitir abrir una nueva rama de desarrollo, implementar alguna nueva funcionalidad, y después unirla de nuevo con el trabajo principal.","",'El primer método para combinarlas que vamos a explorar es `git merge`. Hacer merge en Git crea un commit especial que tiene dos padres diferentes. Un commit con dos padres escencialmente significa "Quiero incluir todo el trabajo de estos dos padres , *y* del conjunto de todos sus ancestros"',"","Es más simple visualizarlo, veámoslo a continuación"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:['Aquí tenemos dos ramas, y cada una tiene un commit que le es único. Esto significa que ninguna de las ramas incluye "todo el trabajo" que hay en nuestro repositorio. Hagamos un merge para solucionar eso.',"","Vamos a `merge`ar la rama `bugFix` a `master`"],afterMarkdowns:["¡Caramba! ¿Viste eso? Antes de nada, `master` ahora apunta a un commit que tiene dos padres. Si sigues las flechas por el árbol de commits empezando desde `master` vas a cruzarte con cada commit del repositorio hasta llegar a la raíz. Esto significa que `master` ahora contiene todo el trabajo que hay en el repositorio.","","Además, ¿viste cómo cambiaron los colores de los commits? Para ayudar al aprendizaje, he incluido algunas convenciones de colores. Cada rama tiene un color propio. Cada commmit se vuelve del color resultante de mezclar los colores de todas las ramas que lo contienen.","","Así que aquí vemos que el color de la rama `master` participa en la mezcla de todos los commits, pero que el de `bugFix` no. Arreglemos eso..."],command:"git merge bugFix",beforeCommand:"git checkout -b bugFix; git commit; git checkout master; git commit"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Hagamos merge de `master` a `bugFix`:"],afterMarkdowns:["Como `bugFix` era un ancestro de `master`, git no tuvo que hacer ningún trabajo; simplemente movió `bugFix` al mismo commit al que estaba anexado `master`.","","Ahora todos los commits son del mismo color, lo que significa que cada rama contiene todo el trabajo que hay en el repositorio. ¡Genial!"],command:"git checkout bugFix; git merge master",beforeCommand:"git checkout -b bugFix; git commit; git checkout master; git commit; git merge bugFix"}},{type:"ModalAlert",options:{markdowns:["Para completar este nivel, sigue estos pasos:","","* Crea una nueva rama, llamada `bugFix`","* Haz checkout de la rama `bugFix` usando `git checkout bugFix`","* Crea un commit","* Vuelve a `master` con `git checkout`","* Crea otro commit","* Haz merge de la rama `bugFix` a `master` usando `git merge`","",'*Recuerda: siempre puedes volver a ver este mensaje escribiendo "objective"!*']}}]},pt_BR:{childViews:[{type:"ModalAlert",options:{markdowns:["## Branches e Merge","","Ótimo! Agora sabemos como commitar e criar ramos. Agora precisamos aprender uma forma de combinar o trabalho de dois ramos diferentes. Isso nos permitirá ramificar, desenvolver um novo recurso, e então combiná-lo de volta.","",'O primeiro método para combinar trabalho que vamos examinar é o `git merge`. O merge do Git cria um commit especial que possui dois pais únicos. Um commit com dois pais essencialmente significa "Quero incluir todo o trabalho deste pai aqui com o daquele outro pai ali, *e* com o do conjunto de todos os seus ancestrais."',"","É mais fácil com uma visualização, vamos ver logo a seguir"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:['Aqui nós temos dois ramos; cada um tem um commit que é único. Isso significa que nenhum ramo inclui o conjunto do "trabalho" que foi realizado no repositório. Vamos consertar isso com um merge.',"","Vamos juntar o ramo `bugFix` no `master`"],afterMarkdowns:["Uau! Viu isso? Antes de tudo, o `master` agora aponta para um commit que possui dois pais. Se você seguir as setas subindo a árvore de commits a partir do `master`, você será capaz de encontrar, ao longo do caminho até a raiz, qualquer um dos commits. Isso significa que o `master` contém todo o trabalho realizado no repositório até o momento.","","Além disso, viu como as cores dos commits mudaram? Para ajudá-lo a aprender, eu incluí uma legenda. Cada ramo tem uma cor única. Cada commit tem a cor resultante da mistura das cores de todos os ramos que o contém.","","Aqui vemos que a cor do ramo `master` está misturada em todos os commits, mas a cor do `bugFix` não está. Vamos corrigir isso..."],command:"git merge bugFix",beforeCommand:"git checkout -b bugFix; git commit; git checkout master; git commit"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Vamos juntar o `master` no `bugFix`:"],afterMarkdowns:["Como o `bugFix` é um ancestral do `master`, o git não teve trabalho nenhum; ele só precisou mover o `bugFix` para o mesmo commit do `master`.","","Agora todos os commits possuem a mesma cor, o que significa que ambos os ramos contém todo o trabalho realizado no repositório! Eba!"],command:"git checkout bugFix; git merge master",beforeCommand:"git checkout -b bugFix; git commit; git checkout master; git commit; git merge bugFix"}},{type:"ModalAlert",options:{markdowns:["Para completar este nível, faça o seguinte:","","* Crie um novo ramo chamado `bugFix`","* Faça checkout no ramo `bugFix` com `git checkout bugFix`","* Faça um commit","* Volte ao `master` com `git checkout`","* Faça um novo commit","* Junte o ramo `bugFix` no `master` com `git merge`","",'*Lembre-se, você pode sempre mostrar esta mensagem novamente com o comando "objective"!*']}}]},gl:{childViews:[{type:"ModalAlert",options:{markdowns:["## Ramas e merges","","¡Xenial! Agora sabemos como facer commits e crear ramas. Agora precisamos aprender unha forma de combinar o traballo de dúas ramas diferentes. Iso permitiríanos ramificar, facer un novo cambio, e entón mesturalo de volta.","",'O primeiro comando para mesturar o traballo que imos ver é `git merge`. O merge de Git crea un commit especial que ten dous pais únicos. Un commit con dous pais significa "Quero incluír todo o traballo deste pai cos cambios do outro pai, *e* o conxunto de tódolos ancestros."',"","É máis doado con unha visualización, ímolo ver na seguinte vista."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:['Aquí nos temos dúas ramas; cada unha ten un commit que é único. Isto significa que ningunha rama inclúe o conxunto de "traballo" feito no noso repositorio. Imos arranxar esto cun merge.',"","Imos xuntar a rama `bugFix` na `master`"],afterMarkdowns:["¡Uah! ¿Viches? Antes de todo, `master` agora apunta a un commit que ten dous pais. Se ti sigues as frechas subindo a árbore de commits a partir de `master`, serás capaz de ver tódolos commits ata a raíz, calquera de eles. Isto significa que a rama `master` contén todo o traballo realizado no repositorio ata ese momento.","","Ademáis, ¿viches como cambiaron as cores dos commits? Para axudarte a aprender, hai unha lenda. Cada rama ten unha única cor. Cada commit ten a cor resultante de mesturar as cores de tódalas ramas que contén.","","Aquí vemos que a  rama `master` está mesturada en todos os commits, pero a cor da rama `bugFix` non o está. Imos arranxar eso..."],command:"git merge bugFix",beforeCommand:"git checkout -b bugFix; git commit; git checkout master; git commit"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Imos mesturar a rama `master` en `bugFix`:"],afterMarkdowns:["Como o `bugFix` é un ancestro de `master`, o git non ten traballo que facer; el só ten que mover o punteiro de `bugFix` para o mesmo commit que `master`.","","Agora tódolos commits teñen a mesma cor, o que significa que ambas ramas teñen o mesmo traballo no repositorios! Iepa!"],command:"git checkout bugFix; git merge master",beforeCommand:"git checkout -b bugFix; git commit; git checkout master; git commit; git merge bugFix"}},{type:"ModalAlert",options:{markdowns:["Para completar este nivel, fai o seguinte:","","* Crea unha nova ramara chamada `bugFix`","* Fai checkout da rama `bugFix` con `git checkout bugFix`","* Fai un commit","* Volve á rama `master` con `git checkout`","* Fai un novo commit","* Xunta a rama `bugFix` en `master` con `git merge`","",'¡Recorda, podes amosar esta mensaxe novamente co comando "objective"!']}}]},fr_FR:{childViews:[{type:"ModalAlert",options:{markdowns:["## Branches et Merges","","Super ! Nous savons désormais comment faire des commits et des branches. Maintenant nous devons apprendre comment combiner ensemble les contenus de deux branches différentes. Ceci nous permettra de créer une nouvelle branche, développer une nouvelle fonctionnalité sur cette dernière, puis intégrer cette fonctionnalité en combinant le contenu de cette branche de développement à la branche d'origine (master par exemple).","","La première méthode que nous allons voir pour combiner le contenu de deux branches est `git merge`. Faire un 'merge' avec Git crée un commit spécial qui a deux parents. Un commit avec deux parents indique en susbtance \"Je veux inclure le contenu de ce parent et le contenu de cet autre parent, *et* l'ensemble de leurs parents.\"","","C'est plus facile en visualisant, regardons dans la vue suivante"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Ici nous avons deux branches ; chacune a un commit qui lui est propre. Cela signifie qu'aucune des deux branches n'inclut la totalité du \"travail\" qui a été fait dans le dépôt. Arrangeons-cela avec merge.","","Nous allons `merge` («fusionner») la branche `bugFix` dans `master`"],afterMarkdowns:["Youhou ! Vous avez vu ça ? Avant tout, `master` pointe donc maintenant sur un commit qui a deux parents. Si vous remontez l'enchaînement des flèches depuis `master`, vous allez passez par tous les commits jusqu'à la racine. Cela signifie que `master` contient maintenant tout le travail du dépôt.","","Par ailleurs, avez-vous remarqué les nouvelles couleurs des commits ? Pour faciliter l'apprentissage, j'ai inclus une certaine logique dans la coloration. Chaque branche a une unique couleur. Chaque commit est de la couleur de toutes les branches qui le contiennent.","","Ici nous voyons que la couleur de `master` est intégrée à tous les commits, sauf ceux de `bugFix`. Réparons-cela ..."],command:"git merge bugFix",beforeCommand:"git checkout -b bugFix; git commit; git checkout master; git commit"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Faisons un merge  de `master` dans `bugFix`:"],afterMarkdowns:["Puisque `bugFix` était un descendant de `master`, git n'avait aucun travail à effectuer; il a simplement déplacé `bugFix` au même commit auquel `master` est attaché.","","Maintenant tous les commits sont de la même couleur, ce qui indique que chaque branche contient tout le contenu du dépôt ! Woohoo!"],command:"git checkout bugFix; git merge master",beforeCommand:"git checkout -b bugFix; git commit; git checkout master; git commit; git merge bugFix"}},{type:"ModalAlert",options:{markdowns:["Pour accomplir ce niveau, effectuez les opérations suivantes :","","* Faites une nouvelle branche appelée `bugFix`","* Positionnez-vous sur la branche `bugFix` avec `git checkout bugFix`","* Faites un commit","* Retournez sur la branche `master` (commande `git checkout`)","* Faites un nouveau commit","* Fusionnez la branche `bugFix` dans `master` avec `git merge`","",'*Rappelez-vous que vous pouvez à tout moment réafficher ces indications avec "objective"!*']}}]},zh_CN:{childViews:[{type:"ModalAlert",options:{markdowns:["## 分支与合并","","太好了! 我们已经知道如何提交以及如何使用分支了。接下来咱们看看如何将两个分支合并到一起。就是说我们新建一个分支，在其上开发某个新功能，开发完成后再合并回主线。","","咱们先来看一下第一种方法 —— `git merge`。在 Git 中合并两个分支时会产生一个特殊的提交记录，它有两个父节点。翻译成自然语言相当于：“我要把这两个父节点本身及它们所有的祖先都包含进来。”","","通过图示更容易理解一些，咱们到下一页看一下。"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["我们准备了两个分支，每个分支上各有一个独有的提交。这意味着没有一个分支包含了我们修改的所有内容。咱们通过合并这两个分支来解决这个问题。","","我们要把 `bugFix` 合并到 `master` 里"],command:"git merge bugFix",afterMarkdowns:["哇哦！看见了吗？首先，`master` 现在指向了一个拥有两个父节点的提交记录。假如从 `master` 开始沿着箭头向上看，在到达起点的路上会经过所有的提交记录。这意味着 `master` 包含了对代码库的所有修改。↓↓↓","","还有，看见各个提交记录的颜色变化了吗？为了帮助学习理解，我引入了颜色搭配。每个分支都有不同的颜色，而每个提交记录的颜色是所有包含该提交记录的分支的颜色混合之后的颜色。","","所以，`master` 分支的颜色被混入到所有的提交记录，但 `bugFix` 没有。下面咱们让它也改变一下颜色。"],beforeCommand:"git checkout -b bugFix; git commit; git checkout master; git commit"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["咱们再把 `master` 分支合并到 `bugFix`："],command:"git checkout bugFix; git merge master",afterMarkdowns:["因为 `master` 继承自 `bugFix`，Git 什么都不用做，只是简单地把 `bugFix` 移动到 `master` 所指向的那个提交记录。","","现在所有提交记录的颜色都一样了，这表明每一个分支都包含了代码库的所有修改！大功告成！"],beforeCommand:"git checkout -b bugFix; git commit; git checkout master; git commit; git merge bugFix"}},{type:"ModalAlert",options:{markdowns:["要想通过这一关，需要以下几步：","","* 创建新分支 `bugFix`","* 用 `git checkout bugFix` 命令切换到该分支","* 提交一次","* 用 `git checkout master` 切换回 `master`","* 再提交一次","* 用 `git merge` 把 `bugFix` 合并到 `master`","","* 你随时都可以用“objective”命令来打开这个对话框！*"]}}]},zh_TW:{childViews:[{type:"ModalAlert",options:{markdowns:["## branch 以及 merge","","太好了! 我們已經知道怎麼使用 commit 和 branch 了。接下來要學的一招是如何合併（merge）兩個不同 branch 的工作。這讓我們可以建立一個新的 branch ，並且在上面開發新功能，然後合併回 master branch。","","`git merge` 是我們要學習 merge 的第一個方法。該 merge 會產生一個特殊的 commit，它包含兩個唯一 parent commit。一個 commit 如果有兩個 parent commit 的話，那就表示：「我想把這兩個 parent commit 本身及它們的 所有的 parent commit 都包含進來。」","","有圖有真相，看看下面的圖就明白了。"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["在這裡，我們有兩個 branch：各自都有一個唯一的 commit。這意味著沒有一個 branch 包含我們對文件的所有修改。讓我們 merge 這兩個 branch 來解決這個問題。","","我們要 merge `bugFix` 到 `master` "],command:"git merge bugFix",afterMarkdowns:["哇！看見了沒有？首先，`master` 現在指向一個 commit，這個 commit 有兩個 parent commit。假如從 `master` 開始沿著箭頭向上走，在到達起點的路上會經過所有的 commit。這說明了現在 `master` 紀錄了對文件的所有修改。","","還有，看見各個 commit 的顏色變化了嗎？為了幫助學習，我混合了顏色。每個 branch 都有特定的顏色。每個 commit 的顏色都變成了含有此 commit 的所有 branch 的混合色。","","所以，`master` branch 的顏色被混入到所有的 commit，但 `bugFix` 沒有。接下來就改一下這裡吧。"],beforeCommand:"git checkout -b bugFix; git commit; git checkout master; git commit"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["讓我們 merge  `master` branch 到 `bugFix` 吧。"],command:"git checkout bugFix; git merge master",afterMarkdowns:["因為 `bugFix` branch只是 `master` branch 的 parent，git 什麼都不用做，只是簡單地把 `bugfix` branch 移動到 `master` 指向的 commit。","","現在所有的 commit 的顏色都是一樣的啦，這表示每一個 branch 都包含了所有文件的修改！太厲害了啦！"],beforeCommand:"git checkout -b bugFix; git commit; git checkout master; git commit; git merge bugFix"}},{type:"ModalAlert",options:{markdowns:["想完成這一關，執行以下的操作：","","* 建立新的 branch，叫做 `bugFix` ","* 用 `git checkout bugFix` 切換到 `bugFix` branch","* commit 一次","* 用 `git checkout` 切換回 `master` branch","* 再 commit 一次","* 用 `git merge`  將 `bugFix` merge 到 `master`","",'*記住，你可以用 "objective" 指令來重新顯示這個對話框！*']}}]},ko:{childViews:[{type:"ModalAlert",options:{markdowns:["## 브랜치와 합치기(Merge)","","좋습니다! 지금까지 커밋하고 브랜치를 만드는 방법을 알아봤습니다. 이제 두 별도의 브랜치를 합치는 몇가지 방법을 알아볼 차례입니다. 이제부터 배우는 방법으로 브랜치를 따고, 새 기능을 개발 한 다음 합칠 수 있게 될 것입니다.","",'처음으로 살펴볼 방법은 `git merge`입니다. Git의 합치기(merge)는 두 개의 부모(parent)를 가리키는 특별한 커밋을 만들어 냅니다. 두개의 부모가 있는 커밋이라는 것은 "한 부모의 모든 작업내역과 나머지 부모의 모든 작업, *그리고* 그 두 부모의 모든 부모들의 작업내역을 포함한다"라는 의미가 있습니다. ',"","그림으로 보는게 이해하기 쉬워요. 다음 화면을 봅시다."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["여기에 브랜치가 두 개 있습니다. 각 브랜치에 독립된 커밋이 하나씩 있구요. 그 말은 이 저장소에 지금까지 작업한 내역이 나뉘어 담겨 있다는 얘기입니다. 두 브랜치를 합쳐서(merge) 이 문제를 해결해 볼까요?","","`bugFix` 브랜치를 `master` 브랜치에 합쳐(merge) 보겠습니다."],afterMarkdowns:["보셨어요? 우선, `master`가 두 부모가 있는 커밋을 가리키고 있습니다. ","","또, 커밋들의 색이 바뀐 것을 눈치 채셨나요? 이해를 돕기위해 색상으로 구분해 표현했습니다. 각 브랜치는 그 브랜치만의 색상으로 그렸습니다. 브랜치가 합쳐지는 커밋의 경우에는, 그 브랜치들의 색을 조합한 색상으로 표시 했습니다.","","그런식으로 여기에 `bugFix`브랜치 쪽을 제외한 나머지 커밋만 `master` 브랜치의 색으로 칠해져 있습니다. 이걸 고쳐보죠..."],command:"git merge bugFix",beforeCommand:"git checkout -b bugFix; git commit; git checkout master; git commit"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["이제 `master` 브랜치에 `bugFix`를 합쳐(merge) 봅시다:"],afterMarkdowns:["`bugFix`가 `master`의 부모쪽에 있었기 때문에, git이 별다른 일을 할 필요가 없었습니다; 간단히 `bugFix`를 `master`가 붙어 있는 커밋으로 이동시켰을 뿐입니다.","","짜잔! 이제 모든 커밋의 색이 같아졌고, 이는 두 브랜치가 모두 저장소의 모든 작업 내역을 포함하고 있다는 뜻입니다."],command:"git checkout bugFix; git merge master",beforeCommand:"git checkout -b bugFix; git commit; git checkout master; git commit; git merge bugFix"}},{type:"ModalAlert",options:{markdowns:["아래 작업을 해서 이 레벨을 통과하세요:","","* `bugFix`라는 새 브랜치를 만듭니다","* `git checkout bugFix`를 입력해 `bugFix` 브랜치로 이동(checkout)합니다.","* 커밋 한 번 하세요","* `git checkout` 명령어를 이용해 `master`브랜치로 돌아갑니다","* 커밋 또 하세요","* `git merge` 명령어로 `bugFix`브랜치를 `master`에 합쳐 넣습니다.","",'*아 그리고, "objective" 명령어로 이 안내창을 다시 볼 수 있다는 것을 기억해 두세요!*']}}]},ru_RU:{childViews:[{type:"ModalAlert",options:{markdowns:["## Ветки и слияния","","Ок! Мы уже знаем, как создавать ветки и коммитить наши изменения. Теперь надо понять, как объединять изменения из двух разных веток. Очень удобно создать ветку, сделать свою часть работы в ней и потом объединить изменения из своей ветки с общими.","","Первый способ объединения изменений, который мы рассмотрим - это `git merge` - слияние или просто мердж. Слияния в Git создают особый вид коммита, который имеет сразу двух родителей. Коммит с двумя родителями обычно означает, что мы хотим объединить изменения из одного коммита с другим коммитом и всеми их родительскими коммитами.","","Слишком запутанно =) На схеме всё проще и понятнее."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:['Вот у нас две ветки, каждая содержит по одному уникальному коммиту. Это означает, что ни одна из веток не содержит полный набор "работ", выполненных в этом репозитории. Можно исправить эту ситуацию, выполнив слияние.',"","Мы сделаем `merge` ветки `bugFix` в ветку `master`"],afterMarkdowns:["Что мы видим? Во-первых, ветка `master` теперь указывает на коммит, у которого два родителя. Если проследовать по стрелкам от этого коммита, вы пройдёте через каждый коммит в дереве прямиком к началу. Это означает, что теперь в ветке `master` содержатся все изменения репозитория.","","Во-вторых, обрати внимание, как изменились цвета коммитов. Мы ввели цветовую дифференциацию, чтобы помочь пониманию. У каждой ветки — свой цвет. Каждый коммит становится того цвета, какого его ветка. Если в нём изменения сразу двух веток - он становится цветом, смешанным из цветов родительских веток.","","И вот мы видим, что цвет ветки `master` подмешан к каждому коммиту, а ветки `bugFix` - нет. Это можно поправить."],command:"git merge bugFix",beforeCommand:"git checkout -b bugFix; git commit; git checkout master; git commit"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Смерджим ветку `master` в ветку `bugFix`"],afterMarkdowns:["Так как ветка `bugFix` была предшественницей `master`, Git не делал ничего, только сдвинул `bugFix` на тот же коммит, где находится `master`","","Теперь все коммиты одного цвета, что означает, что каждая ветка содержит все изменения репозитория! Поздравляем!"],command:"git checkout bugFix; git merge master",beforeCommand:"git checkout -b bugFix; git commit; git checkout master; git commit; git merge bugFix"}},{type:"ModalAlert",options:{markdowns:["Чтобы пройти этот уровень, сделай следующее:","","* Создай новую ветку под названием `bugFix`","* Переключись на новую ветку `bugFix` командой `git checkout bugFix`","* Сделай один коммит","* Вернись на ветку `master` при помощи `git checkout`","* Сделай ещё один коммит","* Слей ветку `bugFix` с веткой `master` при помощи `git merge`","",'* Если что-то пошло не так - можешь подглядеть в эту шпаргалку командой "objective"!*']}}]},uk:{childViews:[{type:"ModalAlert",options:{markdowns:["## Гілки та їх Злиття","","Чудово! Ми знаємо як комітити та створювати гілки. Тепер потрібно навчитися в якийсь спосіб поєднувати інфу з двох чи більше гілок. Це дозволить нам відгілкуватись, зробити нову фічу, й потім інтегрувати її назад.","","Перший спосіб об’єднувати робочу інфу з яким ми розберемось це `git merge`. Команда merge (злити) в Git створює спеціальний коміт який має двох унікальних батьків. Коміт з двома батьками в приниципі просто значить що в нього включена інфа з обох батьків і всіх їх попередників.","","Це простіше сприймається візуально, тому розберемо це в наступному слайді"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:['Тут ми маємо дві гілки; кожна з них містить унікальний коміт. Це означає що жодна з них не містить повного набору "робочої інфи" в цьому репозиторії. Давайте зіллємо всю інфу докупи за допомогою merge.',"","Ми `змержимо` гілку `bugFix` в `master`"],afterMarkdowns:["Нічого собі! Ви це бачили? По-перше, `master` тепер вказує на коміт з двома батьками. Якщо ти піднімешся вверх з цього коміту по дереву, починаючи з `master`, на шляху ти зустрінеш кожен коміт аж до кореневого. Це означає що гілка `master` тепер містить всю інфу в цьому репозиторії.","","А ти помітив як змінилися кольори комітів? Для кращого розуміння процесу я додав певну кольорову диференціацію. Кожен бранч виділено окремим кольором. Колір кожного коміту це суміш кольорів всіх гілок що місять цей коміт.","","Тож ми бачимо що колір гілки `master` містять всі коміти, але не колір `bugFix`. Давайте виправимо це..."],command:"git merge bugFix",beforeCommand:"git checkout -b bugFix; git commit; git checkout master; git commit"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Давай змержимо `master` в `bugFix`:"],afterMarkdowns:["Так як `bugFix` є нащадком `master`, git'у не потрібно нічого робити; він просто пересунув `bugFix` на тей самий коміт, на якому знаходиться `master`.","","Тепер всі коміти одного кольору, що означає що кожен бранч включає в собі всю корисну інфу яка є в цьому репозиторії! Ура!"],command:"git checkout bugFix; git merge master",beforeCommand:"git checkout -b bugFix; git commit; git checkout master; git commit; git merge bugFix"}},{type:"ModalAlert",options:{markdowns:["Щоб пройти цей рівень виконай наступні кроки:","","* Зроби нову гілку (branch) з назвою `bugFix`","* Перейди на гілку `bugFix` за допомогою `git checkout bugFix`","* Зроби один коміт","* Повернись до `master` за допомогою `git checkout`","* Зроби ще один коміт","* Змерджи (злий) гілку `bugFix` в `master` за допомогою `git merge`","",'*Не забувай, ти можеш завжди повернутися до цього діалогу за допомогою "objective"!*']}}]},vi:{childViews:[{type:"ModalAlert",options:{markdowns:["## Nhánh và gộp nhánh","","Tuyệt! Ta đã biết làm sao để commit và tạo nhánh. Giờ ta cần học cách để tập hợp thành quả của 2 nhánh khác biệt lại với nhau. Đây sẽ là cách để ta phân tách để phát triển chức năng, rồi sau đó hợp nhất nó trở lại.","",'Cách đầu tiên để hợp nhất thành quả cần xem xét đến là lệnh `git merge`. Merge trong Git là tạo ra một commit đặc biệt mà có 2 người cha độc nhất. Một commit mà có 2 cha căn bản nghĩa là "Tôi muốn có thành quả của ông này và ông kia nữa, *và* tất cả ông cha của họ."',"","Trực quan thì dễ hiểu hơn, sang trang tiếp theo nào"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:['Ở đây ta có 2 nhánh; mỗi nhánh có 1 commit độc nhất. Có nghĩa là chẳng nhánh nào có đủ "thành quả" trong kho chứa của ta cả. Sửa nó bằng merge nào.',"","Ta sẽ `merge` nhánh `bugFix` vào `master`"],afterMarkdowns:["Wao! Thấy chứ? Trước tiên, `master` giờ đã trỏ đến commit có 2 cha. Nếu bạn lần theo mũi tên lên trên từ `master`, bạn sẽ gặp tất cả các commit lên đến commit gốc. Có nghĩa là `master` giờ đã chứa tất cả thành quả trong kho.","","Đồng thời, bạn thấy màu commit thay đổi chứ? Để bạn dễ học hơn, tôi đã phối hợp một số bảng màu. Mỗi nhánh có một màu duy nhất. Mỗi commit mang màu pha trộn của tất cả nhánh chứa nó.","","Vì vậy, ở đây chúng ta thấy rằng màu nhánh `master` được pha trộn vào tất cả các commit, nhưng màu` bugFix` thì không. Hãy sửa nó nào ..."],command:"git merge bugFix",beforeCommand:"git checkout -b bugFix; git commit; git checkout master; git commit"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Hãy gộp nhánh `master` vào `bugFix` nào:"],afterMarkdowns:["Vì `bugFix` là bậc cha ông của `master`, git chẳng phải làm gì cả; nó đơn giản chỉ chuyển `bugFix` vào commit mà `master` đang trỏ tới.","","Giờ thì tất cả commit đã có cùng màu, nghĩa là mỗi nhánh đã chứa tất cả thành quả trong kho! Ồ hố!"],command:"git checkout bugFix; git merge master",beforeCommand:"git checkout -b bugFix; git commit; git checkout master; git commit; git merge bugFix"}},{type:"ModalAlert",options:{markdowns:["Để hoàn thành cấp độ này, hãy làm theo các bước bên dưới:","","* Tạo một nhánh mới tên là `bugFix`","* Chuyển sang nhánh `bugFix` với `git checkout bugFix`","* Commit một lần","* Trở về `master` với `git checkout`","* Commit một lần nữa","* Gộp nhánh `bugFix` vào `master` với `git merge`","",'*Nhớ rằng, bạn luôn luôn có thể bật lại hội thoại này với lệnh "objective"!*']}}]}}}},{}],117:[function(e,t,o){o.level={goalTreeString:"%7B%22branches%22%3A%7B%22master%22%3A%7B%22target%22%3A%22C3%22%2C%22id%22%3A%22master%22%7D%2C%22bugFix%22%3A%7B%22target%22%3A%22C2%27%22%2C%22id%22%3A%22bugFix%22%7D%7D%2C%22commits%22%3A%7B%22C0%22%3A%7B%22parents%22%3A%5B%5D%2C%22id%22%3A%22C0%22%2C%22rootCommit%22%3Atrue%7D%2C%22C1%22%3A%7B%22parents%22%3A%5B%22C0%22%5D%2C%22id%22%3A%22C1%22%7D%2C%22C2%22%3A%7B%22parents%22%3A%5B%22C1%22%5D%2C%22id%22%3A%22C2%22%7D%2C%22C3%22%3A%7B%22parents%22%3A%5B%22C1%22%5D%2C%22id%22%3A%22C3%22%7D%2C%22C2%27%22%3A%7B%22parents%22%3A%5B%22C3%22%5D%2C%22id%22%3A%22C2%27%22%7D%7D%2C%22HEAD%22%3A%7B%22target%22%3A%22bugFix%22%2C%22id%22%3A%22HEAD%22%7D%7D",solutionCommand:"git checkout -b bugFix;git commit;git checkout master;git commit;git checkout bugFix;git rebase master",name:{en_US:"Rebase Introduction",de_DE:"Einführung in Rebase",ja:"Rebaseの解説",es_AR:"Introducción a rebase",es_ES:"Introducción a rebase",pt_BR:"Introdução ao rebase",gl:"Introducción a rebase",fr_FR:"Introduction à rebase",ko:"리베이스(rebase)의 기본",zh_CN:"Git Rebase",zh_TW:"介紹 rebase",ru_RU:"Введение в rebase",uk:"Знайомство з rebase",vi:"Giới thiệu về rebase"},hint:{en_US:"Make sure you commit from bugFix first",de_DE:"Geh vor dem committen sicher, dass du auf bugFix arbeitest",ja:"初めにbugFixを指した状態でコミットする",fr_FR:"Assurez-vous de bien faire votre commit sur bugFix en premier",es_AR:"Asegurate de commitear desde bugFix primero",es_ES:"Asegúrate de hacer commit desde bugFix primero",pt_BR:"O bugFix precisa ser commitado primeiro",gl:"Asegurate de facer o commit dende bugFix primeiro",ko:"bugFix 브랜치에서 먼저 커밋하세요",zh_CN:"先在 bugFix 分支上进行提交",zh_TW:"你要先在 bugFix branch 進行 commit",ru_RU:"Убедись, что сделал коммит в ветке bugFix",uk:"Впевнись, що зробив коміт в гілці bugFix",vi:"Hãy chắc chắn rằng bạn commit từ bugFix trước"},disabledMap:{"git revert":!0},startDialog:{en_US:{childViews:[{type:"ModalAlert",options:{markdowns:["## Git Rebase","",'The second way of combining work between branches is *rebasing.* Rebasing essentially takes a set of commits, "copies" them, and plops them down somewhere else.',"","While this sounds confusing, the advantage of rebasing is that it can be used to make a nice linear sequence of commits. The commit log / history of the repository will be a lot cleaner if only rebasing is allowed.","","Let's see it in action..."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Here we have two branches yet again; note that the bugFix branch is currently selected (note the asterisk)","","We would like to move our work from bugFix directly onto the work from master. That way it would look like these two features were developed sequentially, when in reality they were developed in parallel.","","Let's do that with the `git rebase` command"],afterMarkdowns:["Awesome! Now the work from our bugFix branch is right on top of master and we have a nice linear sequence of commits.","",'Note that the commit C3 still exists somewhere (it has a faded appearance in the tree), and C3\' is the "copy" that we rebased onto master.',"","The only problem is that master hasn't been updated either, let's do that now..."],command:"git rebase master",beforeCommand:"git commit; git checkout -b bugFix C1; git commit"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Now we are checked out on the `master` branch. Let's go ahead and rebase onto `bugFix`..."],afterMarkdowns:["There! Since `master` was an ancestor of `bugFix`, git simply moved the `master` branch reference forward in history."],command:"git rebase bugFix",beforeCommand:"git commit; git checkout -b bugFix C1; git commit; git rebase master; git checkout master"}},{type:"ModalAlert",options:{markdowns:["To complete this level, do the following","","* Checkout a new branch named `bugFix`","* Commit once","* Go back to master and commit again","* Check out bugFix again and rebase onto master","","Good luck!"]}}]},de_DE:{childViews:[{type:"ModalAlert",options:{markdowns:["## Git Rebase","",'Der zweite Weg um Inhalte aus verschiedenen Branches zu kombinieren ist `git rebase`. Rebasen nimmt im Prinzip eine Menge von Commits, "kopiert" sie und packt sie auf etwas anderes drauf.',"","Auch wenn das erst mal komisch klingt liegt der Vorteil von Rebase darin, dass man es benutzen kann um hübsch lineare Abfolgen von Commits zu erhalten. Das Commit-Protokoll des Repositorys wird durch Rebase eine ganze Ecke einfacher aussehen, weil Merge Commits vermieden werden.","","Schauen wir's uns mal in Aktion an ..."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Hier haben wir wieder zwei Branches; wie du siehst ist `bugFix` aktuell ausgewählt (sieht man am `*`).","","Wir würden jetzt gerne unsere Arbeit aus `bugFix` direkt auf den `master` packen. Das Ergebnis wäre, dass alle aktuellen Änderungen in `master` auch im Branch `bugFix` sind.","","Das machen wir mit dem Befehl `git rebase`:"],afterMarkdowns:["Hammer! Was wir in `bugFix` gemacht haben ist jetzt oben auf `master` draufgepackt und wir haben eine schön lineare Abfolge von Commits bekommen.","",'Commit `C3` existiert immer noch irgendwo (deswegen ist er blaß dargestellt) und `C3\'` ist die "Kopie" die wir auf den `master` gepackt haben.',"","Aber `master` ist jetzt nicht aktualisiert worden, lass uns das gerade noch nachholen ..."],command:"git rebase master",beforeCommand:"git commit; git checkout -b bugFix C1; git commit"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Jetzt sind wir im `master`. Lass uns den mal auf `bugFix` rebasen ..."],afterMarkdowns:["So! Da `master` ein Vorgänger von `bugFix` war konnte Git hier einfach den Bezeichner `master` auf denselben Commit schieben, auf den auch `bugFix` zeigt."],command:"git rebase bugFix",beforeCommand:"git commit; git checkout -b bugFix C1; git commit; git rebase master; git checkout master"}},{type:"ModalAlert",options:{markdowns:["Um dieses Level abzuschließen musst du folgendes tun:","","* Einen neuen Branch namens `bugFix` auschecken","* Einen Commit machen","* Zurück zum `master` wechseln und noch einmal committen","* `bugFix` auschecken und auf den `master` rebasen","","Viel Erfolg!"]}}]},ja:{childViews:[{type:"ModalAlert",options:{markdowns:["## Git Rebase","","ブランチを一つにまとめる方法として前回はマージを紹介しましたが、今回紹介するリベースを使うこともできます。リベースの動作は、マージするコミットのコピーをとって、どこかにストンと落とすというイメージです。","","ピンと来ないかもしれませんが、リベースのメリットは一本の連続したコミットに整形できることです。リベースだけ使っていると、コミットのログや履歴が非常にクリーンな状態に保たれます。","","早速実際にどう動くのかを見てみましょう。"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["前回と同様の2つのブランチを考えます。仮にいまbugFixブランチをチェックアウトしているとします。（アスタリスクつきのもの）","","bugFixに入ってる作業内容をそのまま直接masterブランチ上の内容に移動したいとします。こうすることで、実際には並行して開発された2つの別々のブランチ上の機能のソースを、あたかも1本のブランチ上で連続して開発されていたかのように見せることができます。","","`git rebase`コマンドでそれをやってみましょう。"],afterMarkdowns:["できました！これでbugFixブランチの作業内容はmasterブランチのすぐ先に移動したので、見た目が一本になってスッキリしました。","","気を付けてほしいのは、C3コミットはどこかに残ってるということ（ツリーの中で半透明にしてあります）、そしてC3'は（C1との接続が切れているC3の）コピーがmasterブランチ上に作られているということです。","","一つ問題が残ってて、masterブランチがまだ最新化されていませんね。ちょっと直してみましょう。。"],command:"git rebase master",beforeCommand:"git commit; git checkout -b bugFix C1; git commit"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["masterブランチにチェックアウトしてあります。この状態からmasterブランチを`bugFix`へとリベースしてみましょう。"],afterMarkdowns:["できた！`master`は`bugFix`の直前のコミットだったので、gitは単純に`master`ブランチのポインタを前に進めただけでした。"],command:"git rebase bugFix",beforeCommand:"git commit; git checkout -b bugFix C1; git commit; git rebase master; git checkout master"}},{type:"ModalAlert",options:{markdowns:["以下の作業で理解度の確認をしてみましょう。","","* `bugFix`という名前の新しいブランチをチェックアウトする","* 一回だけコミット","* masterブランチに戻ってもう1回コミット","* bugFixをもう1回チェックアウトして、master上にリベース","","幸運を祈る！"]}}]},es_AR:{childViews:[{type:"ModalAlert",options:{markdowns:["## Git Rebase","",'El segundo modo de combinar el trabajo de distintas ramas es el *rebase*. Rebasear esencialmente agarra un conjunto de commits, los "copia", y los aplica sobre algún otro lado.',"","Aunque esto pueda sonar confuso, la ventaja de rebasear es que puede usarse para conseguir una secuencia de commits lineal, más bonita. El historial / log de commits del repositorio va a estar mucho más claro si sólo usás rebase.","","Veámoslo en acción..."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Acá tenemos dos ramas otra vez. Notar que la rama bugFix está actualmente seleccionada (tiene un asterisco)","","Nos gustaría mover nuestro trabajo de bugFix directamente sobre el trabajo de master. De ese modo, parecería que esas dos tareas se desarrollaron secuencialmente, cuando en realidad se hicieron en paralelo.","","Hagámoslo usando el comando `git rebase`"],afterMarkdowns:["¡Genial! Ahora el trabajo de nuestra rama bugFix está justo encima del de master, y tenemos una secuencia lineal de commits.","",'Notá que el commit C3 sigue existiendo en algún lado (aparece medio desvanecido en el árbol), y C3\' es la "copia" que rebaseamos sobre master.',"","El único problema es que master todavía no se actualizó, resolvámoslo ahora..."],command:"git rebase master",beforeCommand:"git commit; git checkout -b bugFix C1; git commit"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Ahora estamos parados sobre la rama `master`. Avancemos y rebaseémosla sobre `bugFix`..."],afterMarkdowns:["¡Ahí está! Como `master` era un ancestro de `bugFix`, git simplemente movió la referencia de `master` hacia adelante en la historia."],command:"git rebase bugFix",beforeCommand:"git commit; git checkout -b bugFix C1; git commit; git rebase master; git checkout master"}},{type:"ModalAlert",options:{markdowns:["Para completar este nivel, hacé lo siguiente:","","* Checkouteá una nueva rama llamada `bugFix`","* Commiteá una vez","* Volvé a master y commiteå de nuevo","* Checkoutá bugFix otra vez y rebaseala sobre master","","¡Éxitos!"]}}]},es_ES:{childViews:[{type:"ModalAlert",options:{markdowns:["## Git Rebase","",'El segundo modo de combinar el trabajo de distintas ramas es el *rebase*. Hacer rebase escencialmente selecciona un conjunto de commits, los "copia", y los aplica en algún otro lado.',"","Aunque esto pueda sonar confuso, la ventaja de hacer rebase es que puede usarse para conseguir una secuencia de commits lineal, más bonita. El historial / log de commits del repositorio va a estar mucho más claro si sólo usas rebase.","","Veámoslo en acción..."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Aquí tenemos dos ramas otra vez. Observa que la rama bugFix está actualmente seleccionada (tiene un asterisco)","","Nos gustaría mover nuestro trabajo de bugFix directamente sobre el trabajo de master. De ese modo, parecería que esas dos tareas se desarrollaron secuencialmente, cuando en realidad se hicieron en paralelo.","","Hagámoslo usando el comando `git rebase`"],afterMarkdowns:["¡Genial! Ahora el trabajo de nuestra rama bugFix está justo encima del de master, y tenemos una secuencia lineal de commits.","",'Nota que el commit C3 sigue existiendo en algún lado (aparece medio desvanecido en el árbol), y C3\' es la "copia" que rebaseamos sobre master.',"","El único problema es que master todavía no se actualizó, resolvámoslo ahora..."],command:"git rebase master",beforeCommand:"git commit; git checkout -b bugFix C1; git commit"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Ahora estamos parados sobre la rama `master`. Avancemos y hagamos rebase sobre `bugFix`..."],afterMarkdowns:["¡Ahí está! Como `master` era un ancestro de `bugFix`, git simplemente movió la referencia de `master` hacia adelante en la historia."],command:"git rebase bugFix",beforeCommand:"git commit; git checkout -b bugFix C1; git commit; git rebase master; git checkout master"}},{type:"ModalAlert",options:{markdowns:["Para completar este nivel, haz lo siguiente:","","* Haz checkout de una nueva rama llamada `bugFix`","* Crea un commit","* Vuelve a la rama master y crea otro commit","* Haz checkout en bugFix otra vez y haz rebase sobre master","","¡Misión cumplida!"]}}]},pt_BR:{childViews:[{type:"ModalAlert",options:{markdowns:["## Rebase no Git","",'A segunda forma de combinar trabalho entre ramos é o *rebase*. O rebase essencialmente pega um conjunto de commits, "copia" os mesmos, e os despeja em outro lugar.',"","Isso pode parecer confuso, mas a vantagem do rebase é que ele pode ser usado para construir uma sequência mais bonita e linear de commits. O registro de commits (história do repositório) ficará muito mais limpa se for utilizado apenas rebase em vez de merge.","","Vejamo-lo em ação..."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Aqui temos dois ramos novamente; note que o ramo bugFix está atualmente ativo (veja o asterisco)","","Queremos mover nosso trabalho do bugFix diretamente dentro do master. Desta forma, vai parecer que esses dois recursos foram desenvolvidos sequencialmente, quando na realidade foram feitos em paralelo.","","Vamos fazê-lo com o comando `git rebase`"],afterMarkdowns:["Incrível! Agora o trabalho do nosso ramo bugFix está logo após o do master, e temos uma linda sequência linear de commits.","",'Perceba que o commit C3 ainda existe em algum lugar (ele está clareado na árvore), e que o C3\' é a "cópia" que rebaseamos no master.',"","O único problema é que o master não foi atualizado também, vamos fazê-lo agora..."],command:"git rebase master",beforeCommand:"git commit; git checkout -b bugFix C1; git commit"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Agora o ramo `master` está ativo. Vamos em frente, fazer rebase no `bugFix`..."],afterMarkdowns:["Aí está! Como o `master` era um ancestral do `bugFix`, o git simplesmente moveu a referência do ramo `master` para frente na história."],command:"git rebase bugFix",beforeCommand:"git commit; git checkout -b bugFix C1; git commit; git rebase master; git checkout master"}},{type:"ModalAlert",options:{markdowns:["Para completar este nível, faça o seguinte","","* Faça checkout de um novo branch chamado `bugFix`","* Faça um commit","* Volte ao master e faça um novo commit","* Faça checkout do bugFix novamente e faça rebase no master","","Boa sorte!"]}}]},gl:{childViews:[{type:"ModalAlert",options:{markdowns:["## Rebase en Git","",'A segunda forma de mesturar traballo entre ramas é o *rebase*. O rebase esencialmente pega un conxunto de commits, "copia" os commits, e os sitúa en outro lugar.',"","Esto pode paracer confuso, pero a vantaxe do rebase é que se pode usar para construír unha secuencia  máis bonita e linial de commits. O rexisto de commits do repositorio estará máis limpo se só se permite facer rebases.","","Ímolo ver en acción..."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Aquí temos dúas ramas novamente; decátate de que a rama `bugFix` está seleccionada (olla ó asterisco)","","Queremos mover o noso traballo do `bugFix` directamente dentro da rama `master`. Desta forma, vai parecer que eses dous recursos foron editados secuencialmente, cando a realidade é que se fixeron en paralelo.","","Imos lanzar o comando `git rebase`"],afterMarkdowns:["¡Buah chorvo! Agora o traballo da nosa rama `bugFix` está seguida de master, e temos unha fermosa línea de commits.","",'Percibe que o commit `C3` aínda existe nalgún lugar (el está borrado na árbore), e que `C3\'` é a "copia" que rebasamos en master.',"","O único problema é que a rama master non foi actualizada tamén, ímolo facer agora..."],command:"git rebase master",beforeCommand:"git commit; git checkout -b bugFix C1; git commit"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Agora a rama `master` está ativa. Continuamos facendo o rebase na `bugFix`..."],afterMarkdowns:["¡Xa está! Como `master` era um ancestro de `bugFix`, git simplemente moveu a referencia da rama `master` máis adiante na historia."],command:"git rebase bugFix",beforeCommand:"git commit; git checkout -b bugFix C1; git commit; git rebase master; git checkout master"}},{type:"ModalAlert",options:{markdowns:["Para completar este nivel, fai o seguinte","","* Fai checkout de un novo branch chamado `bugFix`","* Fai un commit","* Regresa a master e fai un commit novamente","* Móvete á rama bugFix outra vez e fai rebase sobre master","","Boa sorte!"]}}]},fr_FR:{childViews:[{type:"ModalAlert",options:{markdowns:["## Git Rebase","",'La seconde façon de combiner les contenus de deux branches est *rebase*. Rebase prend un ensemble de commits, les "recopie", et les ajoute en bout de chaîne à un autre endroit.',"","Bien que cela puisse sembler compliqué, l'avantage de rebase est de permettre d'obtenir une simple séquence linéaire de commits. Les logs/l'historique du dépôt seront bien plus propres si seul rebase est autorisé (plutôt que merge).","","Voyons rebase en action…"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Ici nous avons encore une fois deux branches; notez que nous sommes sur la branche bugFix (cf. l'astérisque)","","Nous voudrions transférer notre travail de la branche 'bugFix' directement sur le travail existant dans 'master'. Ainsi on aurait l'impression que ces deux travaux ont été développés séquentiellement alors qu'en réalité ils ont été réalisés en parallèle.","","Faisons cela avec la commande `git rebase`"],afterMarkdowns:["Super! Désormais, le travail de la branche 'bugFix' est juste en haut de la branche 'master' et nous avons une belle séquence linéaire de commits.","","Notez que le commit C3 existe toujours quelque part (il est en grisé sur l'arbre), et C3' est la  \"copie\" que nous avons créée sur master avec rebase.","","Le seul problème est que master n'a pas été mis à jour, faisons cela maintenant…"],command:"git rebase master",beforeCommand:"git commit; git checkout -b bugFix C1; git commit"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Nous sommes désormais positionnés sur la branche `master`. Continuons en faisant le rebase sur `bugFix`…","Et voilà ! Puisque `master` était un ascendant de `bugFix`, git a simplement déplacé la référence de la branche `master` en avant dans le temps."],afterMarkdowns:["Voilà vous avez vu comment cela fonctionne","","Continuons et essayons ce niveau !"],command:"git rebase bugFix",beforeCommand:"git commit; git checkout -b bugFix C1; git commit; git rebase master; git checkout master"}},{type:"ModalAlert",options:{markdowns:["Pour accomplir ce niveau, faites les opérations suivantes","","* Positionnez-vous (checkout) sur une nouvelle branche nommée `bugFix`","* Faites un commit","* Retournez sur master et faites un nouveau commit","* Positionnez-vous à nouveau sur bugFix et faites un rebase sur master","","Bonne chance !"]}}]},zh_CN:{childViews:[{type:"ModalAlert",options:{markdowns:["## Git Rebase","","第二种合并分支的方法是 `git rebase`。Rebase 实际上就是取出一系列的提交记录，“复制”它们，然后在另外一个地方逐个的放下去。","","Rebase 的优势就是可以创造更线性的提交历史，这听上去有些难以理解。如果只允许使用 Rebase 的话，代码库的提交历史将会变得异常清晰。","","咱们还是实际操作一下吧……"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["还是准备了两个分支；注意当前所在的分支是 bugFix（星号标识的是当前分支）","","我们想要把 bugFix 分支里的工作直接移到 master 分支上。移动以后会使得两个分支的功能看起来像是按顺序开发，但实际上它们是并行开发的。","","咱们这次用 `git rebase` 实现此目标"],command:"git rebase master",afterMarkdowns:["怎么样？！现在 bugFix 分支上的工作在 master 的最顶端，同时我们也得到了一个更线性的提交序列。","","注意，提交记录 C3 依然存在（树上那个半透明的节点），而 C3' 是我们 Rebase 到 master 分支上的 C3 的副本。","","现在唯一的问题就是 master 还没有更新，下面咱们就来更新它吧……"],beforeCommand:"git commit; git checkout -b bugFix C1; git commit"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["现在我们切换到了 `master` 上。把它 rebase 到 `bugFix` 分支上……"],command:"git rebase bugFix",afterMarkdowns:["好了！由于 `bugFix` 继承自 `master`，所以 Git 只是简单的把 `master` 分支的引用向前移动了一下而已。"],beforeCommand:"git commit; git checkout -b bugFix C1; git commit; git rebase master; git checkout master"}},{type:"ModalAlert",options:{markdowns:["要完成此关，执行以下操作：","","* 新建并切换到 `bugFix` 分支","* 提交一次","* 切换回 master 分支再提交一次","* 再次切换到 bugFix 分支，rebase 到 master 上","","祝你好运！"]}}]},zh_TW:{childViews:[{type:"ModalAlert",options:{markdowns:["## git rebase","",'*rebasing* 是 merge branch 的第二種方法。rebasing 就是取出一連串的 commit，"複製"它們，然後把它們接在別的地方。',"","雖然聽起來難以理解，rebasing 的優點是可以建立更線性的 commit history。假如只允許使用 rebasing 的話，則我們的 repo 中的 commit log 或者是 commit history 會更加簡潔好看。","","讓我們親身體會一下..."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["這裡，還是有兩個 branch；注意目前我們所在的 branch 是 bugFix（看那顆星啦）","","我們想要把在 bugfix 所做的修改直接移到 master branch上。使用 rebasing 的話，兩個 branch 看起來像是依序按順序進行修改，實際上它們的修改是平行進行的。","","用 `git rebase` 來實現吧"],command:"git rebase master",afterMarkdowns:["很厲害吧！現在 bugFix branch 上的工作在 master branch 的最前端，同時我們也得到了一個更加線性的 commit 順序。","",'注意，本來的 commit C3 沒有消失（在圖上面呈現陰影），而我們"複製" C3，將它的副本 C3\' 接在 master branch 的後面。',"","現在唯一的問題是 master branch 還沒有更新...我們接下來就更新它吧！"],beforeCommand:"git commit; git checkout -b bugFix C1; git commit"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["現在，切換到 `master` branch。接下來就把它 rebase 到 `bugFix` 上面吧..."],command:"git rebase bugFix",afterMarkdowns:["完成！因為 `master` branch 是 `bugFix` 的 parent，所以 git 只是把 `master` branch 往前移動到 `bugFix` 上。"],beforeCommand:"git commit; git checkout -b bugFix C1; git commit; git rebase master; git checkout master"}},{type:"ModalAlert",options:{markdowns:["想完成這一關，執行以下操作：","","* 建立 `bugFix` branch","* commit 一次","* 切換回 master branch 再 commit 一次","* 再次切換到 bugFix branch，接著 rebase bugFix 這個 branch 到 master branch 上","","祝你好運啦！"]}}]},ko:{childViews:[{type:"ModalAlert",options:{markdowns:["## Git 리베이스(Rebase)","","브랜치끼리의 작업을 접목하는 두번째 방법은 *리베이스(rebase)*입니다. 리베이스는 기본적으로 커밋들을 모아서 복사한 뒤, 다른 곳에 떨궈 놓는 것입니다.","","조금 어렵게 느껴질 수 있지만, 리베이스를 하면 커밋들의 흐름을 보기 좋게 한 줄로 만들 수 있다는 장점이 있습니다. 리베이스를 쓰면 저장소의 커밋 로그와 이력이 한결 깨끗해집니다.","","어떻게 동작하는지 살펴볼까요..."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["여기 또 브랜치 두 개가 있습니다; bugFix브랜치가 현재 선택됐다는 점 눈여겨 보세요 (별표 표시)","","bugFix 브랜치에서의 작업을 master 브랜치 위로 직접 옮겨 놓으려고 합니다. 그렇게 하면, 실제로는 두 기능을 따로따로 개발했지만, 마치 순서대로 개발한 것처럼 보이게 됩니다.","","`git rebase` 명령어로 함께 해보죠."],afterMarkdowns:["오! 이제 bugFix 브랜치의 작업 내용이 master의 바로 위에 깔끔한 한 줄의 커밋으로 보이게 됐습니다.","","C3 커밋은 어딘가에 아직 남아있고(그림에서 흐려짐), C3'는 master 위에 올려 놓은 복사본입니다.","","master가 아직 그대로라는 문제가 남아있는데요, 바로 해결해보죠..."],command:"git rebase master",beforeCommand:"git commit; git checkout -b bugFix C1; git commit"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["우리는 지금 `master` 브랜치를 선택한 상태입니다. `bugFix` 브랜치쪽으로 리베이스 해보겠습니다..."],afterMarkdowns:["보세요! `master`가 `bugFix`의 부모쪽에 있었기 때문에, 단순히 그 브랜치를 더 앞쪽의 커밋을 가리키게 이동하는 것이 전부입니다."],command:"git rebase bugFix",beforeCommand:"git commit; git checkout -b bugFix C1; git commit; git rebase master; git checkout master"}},{type:"ModalAlert",options:{markdowns:["이하 작업을 하면 이번 레벨을 통과합니다","","* `bugFix`라는 새 브랜치를 만들어 선택하세요","* 커밋 한 번 합니다","* master로 돌아가서 또 커밋합니다","* bugFix를 다시 선택하고 master에 리베이스 하세요","","화이팅!"]}}]},ru_RU:{childViews:[{type:"ModalAlert",options:{markdowns:["## Git Rebase","","Второй способ объединения изменений в ветках - это *rebasing*. При ребейзе Git по сути копирует набор коммитов и переносит их в другое место.","","Несмотря на то, что это звучит достаточно непонятно, преимущество `rebase` в том, что c его помощью можно делать чистые и красивые линейные последовательности коммитов. История коммитов будет чище, если вы применяете `rebase`.","","Посмотрим, как это работает..."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["У нас здесь снова две ветки. Обрати внимание, что выбрана ветка `bugFix` (отмечена звёздочкой)","","Хочется сдвинуть наши изменения из `bugFix` прямо на вершину ветки `master`. Благодаря этому всё будет выглядеть, как будто эти изменения делались последовательно, хотя на самом деле - параллельно.","","Применим `git rebase`"],afterMarkdowns:["Супер! Теперь изменения из `bugFix` находятся в конце ветки `master` и являют собой линейную последовательность коммитов.","",'Обрати внимание, что коммит С3 до сих пор существует где-то, а С3\' - это его "копия" в ветке `master`',"","Единственная проблема - ветка `master` не обновлена до последних изменений. Это легко исправить."],command:"git rebase master",beforeCommand:"git commit; git checkout -b bugFix C1; git commit"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Вот мы выбрали ветку `master`. Вперёд - сделаем rebase на `bugFix`"],afterMarkdowns:["Вуаля! Так как `master` был предком `bugFix`, git просто сдвинул ссылку на `master` вперёд."],command:"git rebase bugFix",beforeCommand:"git commit; git checkout -b bugFix C1; git commit; git rebase master; git checkout master"}},{type:"ModalAlert",options:{markdowns:["Чтобы пройти этот уровень, сделай следующее:","","* Переключись на ветку `bugFix`","* Сделай коммит","* Вернись на `master` и сделай коммит ещё раз","* Переключись на `bugFix` и сделай rebase на `master`","","Удачи!"]}}]},uk:{childViews:[{type:"ModalAlert",options:{markdowns:["## Git Rebase","",'Інший спосіб комбінування змін з різних бранчів називається *rebase*. Rebase по суті бере кілька комітів , "копіює" їх, й кладе їх в інше місце.',"","Це може звучати трохи незрозуміло, але основна перевага rebase в тому, що його використовують щоб створити зручну лінійну послідовність комітів. Коміт лог та історія будуть виглядати набагато чистіша, якщо користуватися лише rebase (а не merge)","","Спробуємо на практиці..."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Ми знову маємо дві гілки; зауваж, що наразі вибрана гілка bugFix (вважай зірочку)","","Ми хочемо перемістити наші зміни з гілки bugFix прямо до змін з гілки master. Тоді це буде виглядати наче ці зміни були додані одна за одною, хоча насправді вони були додані одночасно.","","Давайте зробимо це за допомогою команди `git rebase`"],afterMarkdowns:["Добре! Тепер зміни з гілки bugFix знаходяться прямо попереду змін з master й ми отримали зручну лінійну послідовність комітів.","",'Вважай що коміт C3 досі десь існує (в дереві він тьмяніший за решту), й C3\' це "копія" яку ми заребейсили в master.',"","Є лише одна проблема: гілка master також не була оновлена, давайте зробимо це наступним кроком..."],command:"git rebase master",beforeCommand:"git commit; git checkout -b bugFix C1; git commit"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Тепер ми перейшли (checkout) до гілки `master`. Далі робимо rebase на `bugFix`..."],afterMarkdowns:["Вуаля! Так як `master` це предок `bugFix`, git просто просунув посилання гілки `master` вперед в історії."],command:"git rebase bugFix",beforeCommand:"git commit; git checkout -b bugFix C1; git commit; git rebase master; git checkout master"}},{type:"ModalAlert",options:{markdowns:["Щоб пройти цей рівень, зроби наступне:","","* Зачекауть (checkout) новий бранч з назвою `bugFix`","* Зроби один коміт","* Повернись на master й зроби ще один коміт","* Зачекауть bugFix знову й заребейсь його на master","","Нехай щастить!"]}}]},vi:{childViews:[{type:"ModalAlert",options:{markdowns:["## Git Rebase","",'Cách thứ 2 để kết hợp thành của của 2 nhánh là *rebase.* Rebase về căn bản là chọn một loạt các commit, "sao chép" chúng, và ném chúng sang chỗ khác.',"","Nghe có vẻ phức tạp, lợi thế của rebase là có thể tạo ra cây lịch sử thẳng tuột. Ljch sử commit nhìn sẽ gọn gàng hơn nhiều.","","Xem nó hoạt động thế nào nào..."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Giờ ta lại có 2 nhánh; để ý rằng nhánh bugFix đang được chọn (thấy dấu hoa thị chứ?)","","Ta muốn chuyển bugFix trực tiếp sang master. Theo cách đó thì các chức năng nhìn có vẻ được phát triển tuần tự, trong khi thực tế chúng được phát triển song song.","","Dùng lệnh `git rebase` để thử nào"],afterMarkdowns:["Tuyệt vời! Giờ thành quả của nhánh bugFix nằm ngay trên master và ta có các commit nằm thẳng tuột.","",'Để ý rằng commit C3 vẫn nằm đâu đó (đã được làm mờ), và commit C3\' là bản "sao chép" mà ta dán lên nhánh master.',"","Vấn đề duy nhất bây giờ là nhánh master vẫn chưa được cập nhật, làm luôn cho nóng nào..."],command:"git rebase master",beforeCommand:"git commit; git checkout -b bugFix C1; git commit"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Giờ thì ta đã chuyển sang nhánh `master`. Tiếp tục dán nó vào `bugFix` nào..."],afterMarkdowns:["Đó! Bởi vì `master` là cha ông của `bugFix`, git đơn giản chuyển tham chiếu của nhánh `master` tiến lên."],command:"git rebase bugFix",beforeCommand:"git commit; git checkout -b bugFix C1; git commit; git rebase master; git checkout master"}},{type:"ModalAlert",options:{markdowns:["Để hoàn thành cấp độ này, làm theo hướng dẫn sau","","* Chuyển sang nhánh mới tên là `bugFix`","* Commit một lần","* Quay về master và commit lần nữa","* Quay trở lại bugFix và rebase sang master","","Chúc may mắn!"]}}]}}}},{}],118:[function(e,t,o){o.level={goalTreeString:'{"branches":{"master":{"target":"C2","id":"master","remoteTrackingBranchID":null},"side":{"target":"C4","id":"side","remoteTrackingBranchID":null},"bugFix":{"target":"C7","id":"bugFix","remoteTrackingBranchID":null}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"},"C2":{"parents":["C1"],"id":"C2"},"C3":{"parents":["C1"],"id":"C3"},"C4":{"parents":["C3"],"id":"C4"},"C5":{"parents":["C3"],"id":"C5"},"C6":{"parents":["C5"],"id":"C6"},"C7":{"parents":["C6"],"id":"C7"}},"tags":{"v0":{"target":"C0","id":"v0","type":"tag"},"v1":{"target":"C3","id":"v1","type":"tag"}},"HEAD":{"target":"bugFix","id":"HEAD"}}',solutionCommand:"git commit ",startTree:'{"branches":{"master":{"target":"C2","id":"master","remoteTrackingBranchID":null},"side":{"target":"C4","id":"side","remoteTrackingBranchID":null},"bugFix":{"target":"C6","id":"bugFix","remoteTrackingBranchID":null}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"},"C2":{"parents":["C1"],"id":"C2"},"C3":{"parents":["C1"],"id":"C3"},"C4":{"parents":["C3"],"id":"C4"},"C5":{"parents":["C3"],"id":"C5"},"C6":{"parents":["C5"],"id":"C6"}},"tags":{"v0":{"target":"C0","id":"v0","type":"tag"},"v1":{"target":"C3","id":"v1","type":"tag"}},"HEAD":{"target":"bugFix","id":"HEAD"}}',name:{en_US:"Git Describe",fr_FR:"Git describe",de_DE:"Git Describe",ja:"Git Describe",es_AR:"Git Describe",es_ES:"Git Describe",pt_BR:"Git Describe",gl:"Git Describe",zh_TW:"git describe",zh_CN:"Git Describe",ru_RU:"Git describe",ko:"Git describe(묘사)",uk:"Git Describe",vi:"Git Describe(mô tả)"},hint:{en_US:"Just commit once on bugFix when you're ready to move on",fr_FR:"Faites un commit sur bugFix quand vous êtes prêt",de_DE:"Committe nur einmal auf bugFix, wenn du soweit bist",ja:"次に進む準備が整ったなら、bugFixに対して一回commitしてください",es_AR:"Simplemente commiteá una vez en bugFix cuando estés listo para seguir",es_ES:"Simplemente crea un commit en la rama bugFix cuando estés listo para seguir",pt_BR:"Simplesmente commite uma vez em bugFix quando quiser parar de experimentar",gl:"Simplemente fai commit en bugFix cando estés listo para continuar.",zh_TW:"當你要移動的時候，只要在 bugFix 上面 commit 就好了",zh_CN:"当你准备好时，在 bugFix 分支上面提交一次就可以了",ru_RU:"Когда закончишь, просто сделай commit",ko:"다음으로 넘어가고 싶으면 bugFix를 한번 커밋하면 됩니다.",uk:"Просто зроби один коміт в bugFix коли ти будеш готовий іти далі",vi:"Đơn giản là hãy commit một lẩn ở bugFix là xong rồi"},startDialog:{en_US:{childViews:[{type:"ModalAlert",options:{markdowns:["### Git Describe","",'Because tags serve as such great "anchors" in the codebase, git has a command to *describe* where you are relative to the closest "anchor" (aka tag). And that command is called `git describe`!',"","Git describe can help you get your bearings after you've moved many commits backwards or forwards in history; this can happen after you've completed a git bisect (a debugging search) or when sitting down at a coworkers computer who just got back from vacation."]}},{type:"ModalAlert",options:{markdowns:["Git describe takes the form of:","","`git describe <ref>`","","Where `<ref>` is anything git can resolve into a commit. If you don't specify a ref, git just uses where you're checked out right now (`HEAD`).","","The output of the command looks like:","","`<tag>_<numCommits>_g<hash>`","","Where `tag` is the closest ancestor tag in history, `numCommits` is how many commits away that tag is, and `<hash>` is the hash of the commit being described."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Let's look at a quick example. For this tree below:"],afterMarkdowns:["The command `git describe master` would output:","","`v1_2_gC2`","","Whereas `git describe side` would output:","","`v2_1_gC4`"],command:"git tag v2 C3",beforeCommand:"git commit; go -b side HEAD~1; gc; gc; git tag v1 C0"}},{type:"ModalAlert",options:{markdowns:["That's pretty much all there is to git describe! Try describing a few of the locations in this level to get a feel for the command.","","Once you're ready, just go ahead and commit once to finish the level. We're giving you a freebie :P"]}}]},fr_FR:{childViews:[{type:"ModalAlert",options:{markdowns:["### Git describe","","Parce ce que les tags sont de très bonnes références dans le code, git à une commande pour *décrire* (describe) la différence entre le commit et le tag le plus récent. Cette commande s'appelle `git describe` !","","Git describe peut vous aider lorsque vous vous êtes beaucoup déplacé; cela peut arriver après un git bisect (chercher l'apparition d'un bug) ou lorsque vous revenez de vacances après 3 semaines sur l'ordinateur d'un collègue."]}},{type:"ModalAlert",options:{markdowns:["Git describe s'écrit comme suit :","","`git describe <ref>`","","où `<ref>` est un n'importe quelle chose que git peut résoudre en un commit. Si vous ne spécifiez pas de ref, `HEAD` est pris par défaut.","","Le résultat de la commande ressemble à :","","`<tag>_<numCommits>_g<hash>`","","où `tag` est le tag le plus proche dans l'historique, `numCommits` le nombre de commits avec le tag, et `<hash>` le hash/identifiant du commit décrit."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Regardons un petit exemple. Prenons cet arbre :"],afterMarkdowns:["La commande`git describe master` donne le résultat :","","`v1_2_gC2`","","alors que `git describe side` donne :","","`v2_1_gC4`"],command:"git tag v2 C3",beforeCommand:"git commit; go -b side HEAD~1; gc; gc; git tag v1 C0"}},{type:"ModalAlert",options:{markdowns:["Ceci résume bien git describe ! Amusez-vous à utiliser cette commande avec d'autres endroits dans ce niveau pour bien comprendre describe.","","Lorsque vous serez prêt, faites simplement un commit pour finir le niveau. Un petit niveau bonus :P"]}}]},zh_TW:{childViews:[{type:"ModalAlert",options:{markdowns:["### git describe","","因為 tag 在 commit tree 上表示的是一個錨點，git 有一個指令可以用來*顯示*離你最近的錨點（也就是 tag），而且這個指令叫做 `git describe`！","","當你已經完成了一個 `git bisect`（一個找尋有 bug 的 commit 的指令），或者是當你使用的是你跑去度假的同事的電腦時， `git describe` 可以幫助你了解你離最近的 tag 差了多少個 commit。"]}},{type:"ModalAlert",options:{markdowns:["`git describe` 的使用方式：","","`git describe <ref>`","","`<ref>` 是任何一個可以被 git 解讀成 commit 的位置，如果你沒有指定的話，git 會以你目前所在的位置為準（`HEAD`）。","","指令的輸出就像這樣：","","`<tag>_<numCommits>_g<hash>`","","`<tag>` 表示的是離 `<ref>` 最近的 tag， `numCommits` 是表示這個 tag 離 `<ref>` 有多少個 commit， `<hash>` 表示的是你所給定的 `<ref>` 所表示的 commit 的前七個 id。"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["讓我們來看一個例子，對於下面的 tree："],afterMarkdowns:["`git describe master` 會輸出：","","`v1_2_gC2`","","`git describe side` 會輸出：","","`v2_1_gC4`"],command:"git tag v2 C3",beforeCommand:"git commit; go -b side HEAD~1; gc; gc; git tag v1 C0"}},{type:"ModalAlert",options:{markdowns:["`git describe` 就是這樣了！試著在這個關卡指定幾個位置來感受一下這個指令吧！","","當你完成的時候，只要一個 commit 就可以結束這個關卡，我們會給你一個免費贈品:P"]}}]},zh_CN:{childViews:[{type:"ModalAlert",options:{markdowns:["### Git Describe","","由于标签在代码库中起着“锚点”的作用，Git 还为此专门设计了一个命令用来**描述**离你最近的锚点（也就是标签），它就是 `git describe`！","","Git Describe 能帮你在提交历史中移动了多次以后找到方向；当你用 `git bisect`（一个查找产生 Bug 的提交记录的指令）找到某个提交记录时，或者是当你坐在你那刚刚度假回来的同事的电脑前时， 可能会用到这个命令。"]}},{type:"ModalAlert",options:{markdowns:["`git describe` 的​​语法是：","","`git describe <ref>`","","`<ref>` 可以是任何能被 Git 识别成提交记录的引用，如果你没有指定的话，Git 会以你目前所检出的位置（`HEAD`）。","","它输出的结果是这样的：","","`<tag>_<numCommits>_g<hash>`","","`tag` 表示的是离 `ref` 最近的标签， `numCommits` 是表示这个 `ref` 与 `tag` 相差有多少个提交记录， `hash` 表示的是你所给定的 `ref` 所表示的提交记录哈希值的前几位。","","当 `ref` 提交记录上有某个标签时，则只输出标签名称"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["让我们来看一个例子，对于下面的提交树："],afterMarkdowns:["`git describe master` 会输出：","","`v1_2_gC2`","","`git describe side` 会输出：","","`v2_1_gC4`"],command:"git tag v2 C3",beforeCommand:"git commit; go -b side HEAD~1; gc; gc; git tag v1 C0"}},{type:"ModalAlert",options:{markdowns:["`git describe` 就是这样了！试着在这个关卡指定几个位置来感受一下这个命令吧！","","当你准备进行下一关时，只要提交一次就可以通过这个关卡。算是我们送你的一个小礼物吧 :P"]}}]},es_AR:{childViews:[{type:"ModalAlert",options:{markdowns:["### Git Describe","",'Como los tags sirven tanto para marcar "hitos" en el código, git tiene un comando para *describir* (_describe_) dónde estás relativo al "hito" más cercano (digamos, "tag"). Y ese comamndo se llama ¡`git describe`!',"","Git describe puede ayudarte a saber dónde estás después de que te hayas movido varios commits hacia adelante o atrás en la historia. Esto puede pasarte después de que termines un git bisect (una búsqueda que te ayuda a debuggear problemas) o cuando te sentás en la computadora de un compañero de trabajo que recién vuelve de unas vacaciones."]}},{type:"ModalAlert",options:{markdowns:["Git describe tiene la siguiente forma:","","`git describe <ref>`","","Donde `<ref>` es cualquier cosa que git puede resolver a un commit. Si no especificás ninguna referencia, git simplemente usa el commit en que estás parado ahora (`HEAD`).","","La salida de ese comando se ve así:","","`<tag>_<numCommits>_g<hash>`","","Donde `tag` es el tag más cercano en la historia, `numCommits` dice a cuántos commits de ese tag estás, y `<hash>` es el hash del commit que estás describiendo."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Veamos un ejemplo breve. Para este árbol de commits:"],afterMarkdowns:["El comando `git describe master` mostraría:","","`v1_2_gC2`","","Mientras que `git describe side` debería mostrar:","","`v2_1_gC4`"],command:"git tag v2 C3",beforeCommand:"git commit; go -b side HEAD~1; gc; gc; git tag v1 C0"}},{type:"ModalAlert",options:{markdowns:["¡Eso es prácticamente todo lo que hay sobre git describe! Probá describiendo algunas referencias en este nivel para amigarte con el comando.","","Cuando estés listo, hacé un commit para terminar el nivel. Te estamos dando una gratis :P"]}}]},es_ES:{childViews:[{type:"ModalAlert",options:{markdowns:["### Git Describe","",'Como los tags sirven tanto para marcar "hitos" en el código, git tiene un comando para *describir* (_describe_) dónde estás relativo al "hito" más cercano (digamos, "tag"). Y ese comamndo se llama ¡`git describe`!',"","Git describe puede ayudarte a saber dónde estás después de que te hayas movido varios commits hacia adelante o atrás en la historia. Esto puede pasarte después de que termines un git bisect (una búsqueda que te ayuda a debuggear problemas) o cuando te sientas delante de la computadora de un compañero de trabajo que acaba de volver de unas vacaciones."]}},{type:"ModalAlert",options:{markdowns:["Git describe tiene la siguiente forma:","","`git describe <ref>`","","Donde `<ref>` es cualquier cosa que git puede resolver a un commit. Si no especificas ninguna referencia, git simplemente usa el commit en el que estás parado ahora (`HEAD`).","","La salida de ese comando se ve así:","","`<tag>_<numCommits>_g<hash>`","","Donde `tag` es el tag más cercano en la historia, `numCommits` dice a cuántos commits de ese tag estás, y `<hash>` es el hash del commit que estás describiendo."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Veamos un ejemplo breve. Para este árbol de commits:"],afterMarkdowns:["El comando `git describe master` mostraría:","","`v1_2_gC2`","","Mientras que `git describe side` debería mostrar:","","`v2_1_gC4`"],command:"git tag v2 C3",beforeCommand:"git commit; go -b side HEAD~1; gc; gc; git tag v1 C0"}},{type:"ModalAlert",options:{markdowns:["¡Eso es prácticamente todo lo que hay sobre git describe! Prueba con algunas referencias en este nivel para familiarizarte con el comando.","","Cuando estés listo, crea un commit para terminar el nivel. Te estamos dando una gratis :P"]}}]},pt_BR:{childViews:[{type:"ModalAlert",options:{markdowns:["### Git Describe","",'Devido ao fato de as tags servirem como "âncoras" tão boas no código, o Git tem um comando para *descrever* onde você está com relação à "âncora" (tag) mais próxima. Esse comando é chamado `git describe`!',"","O git describe pode ajudar a recuperar a sua orientação depois de você ter se movido muitos commits para trás ou para frente no histórico; isso pode acontecer depois de você completar um git bisect (uma busca para debug) ou quando se sentar no computador de um colega que acabou de voltar de férias."]}},{type:"ModalAlert",options:{markdowns:["O git describe é chamado da seguinte forma:","","`git describe <ref>`","","Onde `<ref>` é qualquer coisa que o git possa resolver como uma referência a um commit. Se você não especificar o ref, o Git usa simplesmente o commit atual (`HEAD`).","","A saída do comando é mais ou menos assim:","","`<tag>_<numCommits>_g<hash>`","","Onde `tag` é a tag ancestral mais próxima no histórico, `numCommits` é o número de commits de distância da tag, e `<hash>` é o hash do commit sendo descrito."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Vejamos um exemplo rápido. Para a árvore abaixo:"],afterMarkdowns:["O comando `git describe master` daria a saída:","","`v1_2_gC2`","","Enquanto `git describe side` daria:","","`v2_1_gC4`"],command:"git tag v2 C3",beforeCommand:"git commit; go -b side HEAD~1; gc; gc; git tag v1 C0"}},{type:"ModalAlert",options:{markdowns:["É basicamente disso que se trata o git describe! Tente descrever alguns locais da árvore para sentir como o comando se comporta.","","Uma vez que você estiver satisfeito, apenas faça um commit que o nível será finalizado. Essa é de graça :P"]}}]},gl:{childViews:[{type:"ModalAlert",options:{markdowns:["### Git Describe","",'Como as tags fan a función de "áncora" no repositorio, Git ten un comando para *describir* ónde podes estar ti en relación á "áncora" (tag) máis próxima. Ese comando chámase `git describe`!',"","Git describe pode axudar a recuperar a túa posición despois de mover moitos commits para atrás ou para adiante na historia; esto pode suceder depois de que fagas un git bisect (unha búsqueda para atopar erros) ou cando te sentas no ordenador dun colega que chegou das vacacións."]}},{type:"ModalAlert",options:{markdowns:["Git describe lánzase do seguinte xeito:","","`git describe <ref>`","","Onde `<ref>` é qualquera cousa que git poida resolver como unha referencia a un commit. Se non especificas a ref, git usará o commit actual no que se esté traballando (`HEAD`).","","A resposta do comando é algo semellante a esto:","","`<tag>_<numCommits>_g<hash>`","","Onde `tag` é a tag anterior máis próxima na historia, `numCommits` é o número de commits de distancia ó tag, e `<hash>` é o hash do commit no que estamos."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Vexamos un exemplo rápido. Para a árbore de abaixo:"],afterMarkdowns:["O comando `git describe master` daría a saída:","","`v1_2_gC2`","","Mentres que `git describe side` daría:","","`v2_1_gC4`"],command:"git tag v2 C3",beforeCommand:"git commit; go -b side HEAD~1; gc; gc; git tag v1 C0"}},{type:"ModalAlert",options:{markdowns:["¡Básicamente é iso do que trata git describe! Intenta descubrir algúns locais da árbore para sentir como se comporta o comando.","","Cando estés listo, fai un commit para que o nivel remate. Esa é a gracia."]}}]},de_DE:{childViews:[{type:"ModalAlert",options:{markdowns:["### Git Describe","",'Weil Tags so super als "Anker" im Repository dienen können bietet Git einen Befehl um zu *beschreiben* wo du dich relativ zum nächsten "Anker" (also Tag) befindest. Und der heißt `git describe`.',"","Er hilft dir dabei, dir einen Überblick zu verschaffen nachdem du viele Commits im Log zurück- oder vorgegangen bist; das kann vorkommen nachdem du ein `git bisect` (eine Fehlersuche) abgeschlossen hast oder wenn du dich an den Rechner eines Kollegen setzt, der gerade aus dem Urlaub gekommen ist."]}},{type:"ModalAlert",options:{markdowns:["Der Befehl ist folgendermaßen aufgebaut:","","`git describe <Ref-Name>`","","Dabei ist `<Ref-Name>` jeder beliebige Name, der einem Commit zugeordnet ist (Branch, Tag etc). Wenn du keinen angibst benutzt Git `HEAD`, also den aktuellen Checkout.","","Die Befehlsausgabe sieht so aus:","","`<Tag-Name>_<Anzahl Commits>_g<Hash>`","","`<Tag-Name>` ist dabei der nächstliegende Tag in den Vorgänger-Commits, `<Anzahl Commits>` zeigt an, wieviele Commits dieses Tag entfernt ist und `<Hash>` ist das SHA des Commits, auf den HEAD zeigt.","","**Achtung**: `<Anzahl Commits>` und `<Hash>` erscheint nur, wenn HEAD nicht auf ein Tag zeigt. `git describe` verarbeitet standardmässig nur annotierte Tags. Um nicht annotierte tags zu sehen, verwende bitte`git describe --tags`."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Schauen wir uns das schnell an einem Beispiel an. Für den folgenden Baum:"],afterMarkdowns:["Der Befehl `git describe master` würde folgendes ausgeben:","","`v1_2_gC2`","","Wohingegen `git describe side` dies ausgeben würde:","","`v2_1_gC4`"],command:"git tag v2 C3",beforeCommand:"git commit; go -b side HEAD~1; gc; gc; git tag v1 C0"}},{type:"ModalAlert",options:{markdowns:["Das ist so ziemlich alles, was es über `git describe` zu wissen gibt. Versuch ein paar Orte in diesem Level damit auszugeben, um ein Gefühl dafür zu bekommen.","","Sobald du fertig bist, mach einfach einen Commit um den Level abzuschließen. Der geht auf's Haus. :P"]}}]},ja:{childViews:[{type:"ModalAlert",options:{markdowns:["### Git Describe","","タグは、ソースリストの優秀な「アンカー（標識）」として作用するので、Gitには最も近く関係のある「アンカー」（タグの別名）を*記述するため*のコマンドがあります。そして、そのコマンドは`git describe`と呼ばれています！","","Gitの`describe`は、あなたが大量のコミットの中を移動するとき、今どこにいるかを知るのを助けてくれます（このような状況は、例えばあなたがデバッグ検索コマンドの一つ`git bisect`を走らせ終わった後や、同僚が休暇から帰ってきて自分の席に座るときに起こります）。"]}},{type:"ModalAlert",options:{markdowns:["Gitの`describe`は、以下の形式をとります:","","`git describe <参照>`","","`<参照>`には、Gitが解釈可能なコミットの参照表現（ブランチやタグの指定、コミットハッシュなど）をいれます。もし、何も入力しなかった場合、Gitは現在の位置のコミット（`HEAD`）を使います。","","コマンドの結果は以下のようになります:","","`<タグ>_<コミット数>_g<ハッシュ>`","","`<タグ>`には履歴の一番最新のタグ名が、`<コミット数>`にはそのタグから幾つのコミットがあったか、`<ハッシュ>`はそのコミットのハッシュがそれぞれ入ります。"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["軽い例を見てみましょう。この木においての例は以下のようになります:"],afterMarkdowns:["コマンド`git describe master`の結果は以下のようになります:","","`v1_2_gC2`","","さらに`git describe side`の結果は以下のようになります:","","`v2_1_gC4`"],command:"git tag v2 C3",beforeCommand:"git commit; go -b side HEAD~1; gc; gc; git tag v1 C0"}},{type:"ModalAlert",options:{markdowns:["`describe`によってGitの情報が簡潔に全て記述されます！このレベルでは、このコマンドの感触をつかむため幾つかの場所で`describe`をしてみてください。","","終わったら、最新のコミットに行き一度コミットを行えばこのレベルを終了することができます。この先では、いくつかの挑戦課題を用意しています :P"]}}]},ru_RU:{childViews:[{type:"ModalAlert",options:{markdowns:["### Git Describe","","Теги являются прекрасными ориентирами в истории изменений, поэтому в git есть команда, которая показывает, как далеко текущее состоянии от ближайшего тега. И эта команда называется `git describe`","","Git describe помогает сориентироваться после отката на много коммитов по истории изменений. Такое может случиться, когда вы сделали `git bisect` или если вы недавно вернулись из отпуска =)"]}},{type:"ModalAlert",options:{markdowns:["Git describe выглядит примерно так:","","`git describe <ref>`","","Где `ref` — это что-либо, что указывает на конкретный коммит. Если не указать `ref`, то git будет считать, что указано текущее положение (`HEAD`).","","Вывод команды выглядит примерно так:","","`<tag>_<numCommits>_g<hash>`","","Где `tag` – это ближайший тег в истории изменений, `numCommits` – это на сколько далеко мы от этого тега, а `hash` – это хеш коммита, который описывается."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Посмотрим на простой пример. Для дерева, показанного ниже:"],afterMarkdowns:["Команда `git describe master` выведет:","","`v1_2_gC2`","","Тогда как `git describe side` выведет:","","`v2_1_gC4`"],command:"git tag v2 C3",beforeCommand:"git commit; go -b side HEAD~1; gc; gc; git tag v1 C0"}},{type:"ModalAlert",options:{markdowns:["Это, в общем-то, всё, что можно сказать про `git describe`. Попробуй выполнить команду на нескольких коммитах.","","Как только наиграешься, просто сделай один коммит, и уровень будет пройден."]}}]},ko:{childViews:[{type:"ModalAlert",options:{markdowns:["### Git Describe","",'커밋 트리에서 태그가 훌륭한 "닻"역할을 하기 때문에, git에는 여러분이 가장 가까운 "닻(태그)"에 비해 상대적으로 어디에 위치해있는지 *describe(묘사)*해주는 명령어가 있습니다. 이 명령어는 `git describe` 입니다!',"","Git describe는 커밋 히스토리에서 앞 뒤로 여러 커밋을 이동하고 나서 커밋 트리에서 방향감각을 다시 찾는데 도움을 줍니다; 이런 상황은 git bisect(문제가 되는 커밋을 찾는 명령어라고 간단히 생각하자)를 하고 나서라던가 휴가를 다녀온 동료의 컴퓨터에 앉는경우가 있습니다."]}},{type:"ModalAlert",options:{markdowns:["Git describe 는 다음의 형태를 가지고 있습니다:","","`git describe <ref>`","","`<ref>`에는 commit을 의미하는 그 어떤것이던 쓸 수 있습니다. 만약 ref를 특정 지어주지 않으면, git은 그냥 지금 체크아웃된곳을 사용합니다 (`HEAD`).","","명령어의 출력은 다음과 같은 형태로 나타납니다:","","`<tag>_<numCommits>_g<hash>`","","`tag`는 가장 가까운 부모 태그를 나타냅니다. `numCommits`은 그 태그가 몇 커밋 멀리있는지를 나타냅니다. `<hash>`는 묘사하고있는 커밋의 해시를 나타냅니다."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["간단한 예제를 확인해 봅시다. 아래의 트리에서:"],afterMarkdowns:["`git describe master` 명령은 다음을 출력합니다:","","`v1_2_gC2`","","`git describe side`는 다음을 출력합니다:","","`v2_1_gC4`"],command:"git tag v2 C3",beforeCommand:"git commit; go -b side HEAD~1; gc; gc; git tag v1 C0"}},{type:"ModalAlert",options:{markdowns:["이정도면 git describe를 충분히 활용할 수 있습니다! 이 레벨의 몇 지점을 describe 명령어를 통해 확인해보면서 느낌을 익혀 봅시다.","","준비가 되면 커밋을 한번해서 레벨을 종료하세요. 자유롭게 연습해보세요 :P"]}}]},uk:{childViews:[{type:"ModalAlert",options:{markdowns:["### Git Describe","",'Через те, що таги є такими чудовими "орієнтирами" по коду, git також має команду *описати* (describe) де ти є відносно найближчого "орієнтира" (тобто тага). І ця команда називається `git describe`!',"","Git describe допоможе тобі знайти себе після того як ти перестрибнеш на кілька комітів по історії вперед чи назад; це може статися після того як ти закінчив git bisect (пошук-дебаггер) чи коли тебе попросили підійти до колеги, котрий щойно прийшов з відпустки."]}},{type:"ModalAlert",options:{markdowns:["Git describe має наступну форму:","","`git describe <посилання>`","","Де `<посилання>` -- це будь-що, що вказує на конкретний коміт. Якщо ти не вкажеш посилання, git використає поточну локацію (`HEAD`).","","Вивід команди виглядає як:","","`<таг>_<к-ть комітів>_g<хеш>`","","де `таг` -- це найближчий попередній таг з історії; `к-ть комітів` -- це наскільки далеко цей таг в історії, а `<хеш>` -- це хеш коміту, який описується."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Розгляньмо короткий приклад. Для дерева нижче:"],afterMarkdowns:["Команда `git describe master` виведе:","","`v1_2_gC2`","","коли `git describe side` виведе:","","`v2_1_gC4`"],command:"git tag v2 C3",beforeCommand:"git commit; go -b side HEAD~1; gc; gc; git tag v1 C0"}},{type:"ModalAlert",options:{markdowns:["Ось і все що ти маєш знати про git describe. Спробуй виконати describe для різних місць в дереві комітів щоб набити руку.","","Як будеш готовий, просто закоміть щось щоб закінчити цей рівень. Трохи шари :P"]}}]},vi:{childViews:[{type:"ModalAlert",options:{markdowns:["### Mô tả của Git","",'Bởi gì thẻ đóng vai trò như là "mỏ neo" trên cây lịch sử rất tốt rồi, git cũng có lệnh để *mô tả* tương quan của bạn dến vị trí "mỏ neo" (thẻ) gần nhất. Và đó là `git describe`!',"","`git descripe` có thể giúp bạn định hướng sau khi dịch chuyển qua lại nhiều lần trên cây lịch sử; đặc biệt là sau khi sử dụng `git bisect` (công cụ tìm kiếm lỗi của git) hoặc khi sử dụng máy của đồng nghiệp mới đi nghỉ mát về."]}},{type:"ModalAlert",options:{markdowns:["Cú pháp sử dụng Git describe như sau:","","`git describe <thamchiếu>`","","Trong đó `<thamchiếu>` là bất kỳ thứ gì mà git có thể dùng để xác định commit. Nếu bạn không chỉ định tham chiếu, git sẽ dùng vị trí hiện tại của bạn (`HEAD`).","","Đầu ra của câu lệnh sẽ như sau:","","`<thẻ>_<sốLượngCommit>_g<mãBăm>`","","Trong đó `<thẻ>` là thẻ tổ tiên gần nhất, `<sốLượngCommit>` là số lượng commit tính từ tham chiếu đến thẻ, và `<mãBăm>` là mã băm của commit được mô tả."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Cùng xem nhanh một ví dụ trên cây lịch sử phía dưới:"],afterMarkdowns:["Câu lệnh `git describe master` sẽ cho kết quả:","","`v1_2_gC2`","","Trong khi `git describe side` sẽ cho kết quả:","","`v2_1_gC4`"],command:"git tag v2 C3",beforeCommand:"git commit; go -b side HEAD~1; gc; gc; git tag v1 C0"}},{type:"ModalAlert",options:{markdowns:["Từng đó thông tin là khá đủ về git describe! Hãy thử dùng `git describe` trên vài vị trí để hiểu về lệnh này.","","Một khi bạn đã sẵn sàng thì chỉ cần commit 1 lần là qua bài này. Bài này dễ chơi rồi nhé :P"]}}]}}}},{}],119:[function(e,t,o){o.level={compareOnlyMasterHashAgnosticWithAsserts:!0,goalAsserts:{master:[function(e){return e.C4>e.C1}]},disabledMap:{"git revert":!0},goalTreeString:"%7B%22branches%22%3A%7B%22master%22%3A%7B%22target%22%3A%22C4%27%22%2C%22id%22%3A%22master%22%7D%2C%22debug%22%3A%7B%22target%22%3A%22C2%22%2C%22id%22%3A%22debug%22%7D%2C%22printf%22%3A%7B%22target%22%3A%22C3%22%2C%22id%22%3A%22printf%22%7D%2C%22bugFix%22%3A%7B%22target%22%3A%22C4%27%22%2C%22id%22%3A%22bugFix%22%7D%7D%2C%22commits%22%3A%7B%22C0%22%3A%7B%22parents%22%3A%5B%5D%2C%22id%22%3A%22C0%22%2C%22rootCommit%22%3Atrue%7D%2C%22C1%22%3A%7B%22parents%22%3A%5B%22C0%22%5D%2C%22id%22%3A%22C1%22%7D%2C%22C2%22%3A%7B%22parents%22%3A%5B%22C1%22%5D%2C%22id%22%3A%22C2%22%7D%2C%22C3%22%3A%7B%22parents%22%3A%5B%22C2%22%5D%2C%22id%22%3A%22C3%22%7D%2C%22C4%22%3A%7B%22parents%22%3A%5B%22C3%22%5D%2C%22id%22%3A%22C4%22%7D%2C%22C4%27%22%3A%7B%22parents%22%3A%5B%22C1%22%5D%2C%22id%22%3A%22C4%27%22%7D%7D%2C%22HEAD%22%3A%7B%22target%22%3A%22master%22%2C%22id%22%3A%22HEAD%22%7D%7D",solutionCommand:"git rebase -i master --solution-ordering C4; git rebase bugFix master",startTree:'{"branches":{"master":{"target":"C1","id":"master"},"debug":{"target":"C2","id":"debug"},"printf":{"target":"C3","id":"printf"},"bugFix":{"target":"C4","id":"bugFix"}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"},"C2":{"parents":["C1"],"id":"C2"},"C3":{"parents":["C2"],"id":"C3"},"C4":{"parents":["C3"],"id":"C4"}},"HEAD":{"target":"bugFix","id":"HEAD"}}',name:{ko:"딱 한개의 커밋만 가져오기",en_US:"Grabbing Just 1 Commit",fr_FR:"Choisir seulement 1 commit",de_DE:"Einen Commit pflücken",es_AR:"Tomando un único commit",es_ES:"Tomando un único commit",pt_BR:"Pegando um único commit",gl:"Escollendo un único commit",ja:"一つのコミットのみを取得",zh_CN:"只取一个提交记录",zh_TW:"只取一個 commit",ru_RU:"Выберем один коммит.",uk:"Вибираємо всього один коміт",vi:"Chỉ lấy 1 commit"},hint:{en_US:"Remember, interactive rebase or cherry-pick is your friend here",de_DE:"Vergiss nicht: hier kommst du mit interaktivem Rebase oder Cherry-Picking weiter",fr_FR:"Souvenez-vous, les rebases interactifs ou cherry-pick sont vos amis ici.",es_AR:"Acordate, el rebase interactivo o cherry-pick son tus amigos acá",es_ES:"Recuerda, el rebase interactivo y el cherry-pick son tus amigos",pt_BR:"Lembre-se, o rebase interativo ou o cherry-pick são seus amigos aqui",gl:"Recorda, o rebase interativo ou cherry-pick é un dos teus colegas aquí",ja:"このレベルではインタラクティブモードのrebaseやcherry-pickがクリアのカギです",ko:"대화식 리베이스(rebase -i)나 or 체리픽(cherry-pick)을 사용하세요",zh_CN:"你有两个朋友，cherry-pick 和 rebase -i",zh_TW:"記住，使用互動式的 rebase 或者 cherry-pick 會很有幫助",ru_RU:"Не забывай, что интерактивный rebase и cherry-pick – это твои друзья!",uk:"Не забувай, що інтерактивний rebase та cherry-pick -- це твої друзі!",vi:"Hãy nhớ 2 anh bạn tương tác rebase và cherry-pick!"},startDialog:{en_US:{childViews:[{type:"ModalAlert",options:{markdowns:["## Locally stacked commits","","Here's a development situation that often happens: I'm trying to track down a bug but it is quite elusive. In order to aid in my detective work, I put in a few debug commands and a few print statements.","","All of these debugging / print statements are in their own commits. Finally I track down the bug, fix it, and rejoice!","","Only problem is that I now need to get my `bugFix` back into the `master` branch. If I simply fast-forwarded `master`, then `master` would get all my debug statements which is undesirable. There has to be another way..."]}},{type:"ModalAlert",options:{markdowns:["We need to tell git to copy only one of the commits over. This is just like the levels earlier on moving work around -- we can use the same commands:","","* `git rebase -i`","* `git cherry-pick`","","To achieve this goal."]}},{type:"ModalAlert",options:{markdowns:["This is a later level so we will leave it up to you to decide which command you want to use, but in order to complete the level, make sure `master` receives the commit that `bugFix` references."]}}]},fr_FR:{childViews:[{type:"ModalAlert",options:{markdowns:["## Les commits empilés localement","","Voici une situation qui arrive souvent : j'ai un bug assez caché à corriger. Pour trouver la source je rajoute des commandes et prints de debug à travers le code.","","Tous ces debug se retrouvent dans une branche particulière. Je trouve le bug et le répare, comme toujours !","","Le seul problème c'est que je ne peux pas faire de merge ou rebase, car tous ces commits de debug seront dans le master. Il doit y avoir une autre façon..."]}},{type:"ModalAlert",options:{markdowns:["Pour réussir ce niveau, nous avons besoin de dire à Git quel commit particulier recopier. C'est comme pour le niveau précédent : nous pouvons utiliser les mêmes commandes :","","* `git rebase -i`","* `git cherry-pick`"]}},{type:"ModalAlert",options:{markdowns:["C'est un niveau avancé, donc à vous de choisir quelle commande utiliser, mais pour réussir ce niveau, assurez-vous que `master` reçoive le même commit que `bugFix` référence."]}}]},es_AR:{childViews:[{type:"ModalAlert",options:{markdowns:["## Commits localmente stackeados","","Esta es una escena que suele pasar cuando uno desarrolla: estoy tratando de encontrar un bug bastante escurridizo. Para ayudar en mi tarea de detective, agrego un par de comandos de debug, y algunas sentencias para imprimir el estado de mi sistema.","","Todas estas cosas de imprimir y debuggear estan en su propia rama. Finalmente encuentro el problema, lo soluciono, ¡y disfruto!","","El único problema es que ahora necesito llevar mi `bugFix` a la rama `master`. Si simplemente fast-forwardeo `master`, entonces `master` va a tener todos mis agregados de debugging, que es indeseado. Tiene que haber otro modo..."]}},{type:"ModalAlert",options:{markdowns:["Necesitamos decirle a git que sólo copie uno de los commits. Esto es tal como los niveles anteriores de mover commits por ahí -- podemos usar los mismos comandos:","","* `git rebase -i`","* `git cherry-pick`","","Para conseguir este resultado."]}},{type:"ModalAlert",options:{markdowns:["Este es un nivel más avanzado, así que está en vos decidir cuál de los dos comandos querés usar, pero para completar el nivel asegurate de que `master` recibe el commit que `bugFix` referencia."]}}]},es_ES:{childViews:[{type:"ModalAlert",options:{markdowns:["## Commits localmente stackeados","","Esta es una escena que suele pasar cuando uno desarrolla: estoy tratando de encontrar un bug bastante escurridizo. Para ayudar en mi tarea de detective, agrego un par de comandos de debug, y algunas sentencias para imprimir el estado de mi sistema.","","Todas estas cosas de imprimir y debuggear estan en su propia rama. Finalmente encuentro el problema, lo soluciono, ¡y disfruto!","","El único problema es que ahora necesito llevar mi `bugFix` a la rama `master`. Si simplemente fast-forwardeo `master`, entonces `master` va a tener todos mis agregados de debugging, lo cual no es deseable. Tiene que haber otro modo..."]}},{type:"ModalAlert",options:{markdowns:["Necesitamos decirle a git que sólo copie uno de los commits. Esto es tal como los niveles anteriores de mover commits por ahí -- podemos usar los mismos comandos:","","* `git rebase -i`","* `git cherry-pick`","","Para conseguir este resultado."]}},{type:"ModalAlert",options:{markdowns:["Este es un nivel más avanzado, así que debes decidir cuál de los dos comandos quieres usar, pero para completar el nivel asegurate de que `master` recibe el commit que `bugFix` referencia."]}}]},pt_BR:{childViews:[{type:"ModalAlert",options:{markdowns:["## Commits empilhados localmente","","Aqui está uma situação de acontece frequentemente com desenvolvedores: Estou tentando encontrar um bug, mas ele é escorregadio. Para auxiliar meu trabalho de detetive, eu coloco alguns comandos de debug e prints.","","Todos esses comandos de debug e mensagens estão em seus próprios ramos. Finalmente eu encontro o bug, corrijo, e me regozijo!","","O único problema é que agora eu preciso devolver o meu `bugFix` ao ramo `master`. Se eu simplesmente der um fast-forward no `master`, então o `master` terminará contendo todos os comandos de debug, o que é indesejável. Deve existir alguma outra forma..."]}},{type:"ModalAlert",options:{markdowns:["Precisamos dizer ao git para copiar somente um dos commits. Esta situação é exatamente a mesma dos níveis anteriores a respeito de como mover trabalho -- podemos usar os mesmos comandos:","","* `git rebase -i`","* `git cherry-pick`","","Para alcançar o objetivo."]}},{type:"ModalAlert",options:{markdowns:["Este é um nível avançado, então vamos deixar para você a decisão de qual comando usar, mas para completar este nível, certifique-se de que o `master` receba o commit referenciado por `bugFix`."]}}]},gl:{childViews:[{type:"ModalAlert",options:{markdowns:["## Commits apilados localmente","","Aquí estamos nunha situación que acontece de cotio con desenvolvedores: Estou intentando atopar un erro, mais é escorredizo. Para axudar ó meu traballo de detective, eu coloco algúns comandos de debug e prints.","","¡Todos esos comandos de debug e mensaxes están nas súas ramas propias. Finalmente eu atopo o erro, arránxoo e reorganizo!","","O único problema é que agora eu preciso devolver o meu `bugFix` á rama `master`. Se eu fixera simplemente un fast-forward en `master`, entón o `master` rematará contendo tódolos comandos de debug, o que é indesexable. Debe existir algunha outra forma..."]}},{type:"ModalAlert",options:{markdowns:["Precisamos decirlle a git que copie só os commits que nos interesa. Esta situación é exatamente a mesma dos niveis anteriores respecto de como mover o traballo -- podemos usar os mesmos comandos:","","* `git rebase -i`","* `git cherry-pick`","","Para acadar o objetivo."]}},{type:"ModalAlert",options:{markdowns:["Este é un nivel avanzado, entón imos deixarche a decisión de qué comando empregar, pero para completar este nivel, asegurate de que a rama `master` colla o commit referenciado por `bugFix`."]}}]},de_DE:{childViews:[{type:"ModalAlert",options:{markdowns:["## Lokale Commit-Haufen","","Folgende Situation habe ich beim Entwickeln des öfteren: ich bin auf der Suche nach einem Bug, aber er ist echt schwer zu finden. Um ihm auf die Spur zu kommen schreibe ich mehrere Debug-Kommandos und print-Befehle in den Code.","","Die committe ich auch immer wieder, je weiter die Suche mich trägt; natürlich in einem lokalen Branch. Schließlich finde ich den Bug, fixe ihn und freue mich!","","Einziges Problem ist, dass ich diesen `bugFix` jetzt zurück in den `master` kriegen muss. Wenn ich einfach den `master` vorspule oder meinen Branch hinein merge, bekäme der `master` auch die ganzen Debug-Befehle, was nicht gewünscht ist. Das muss anders gehen ..."]}},{type:"ModalAlert",options:{markdowns:["Wir müssten Git sagen können, dass es nur einen Commit herüber kopieren soll. Das ist genauso wie die Level vorhin zum Code-Verschieben. Wir können dieselben Befehle benutzen:","","* `git rebase -i`","* `git cherry-pick`",""]}},{type:"ModalAlert",options:{markdowns:["Da dies ein späterer Level ist überlasse ich es dir zu entscheiden, welchen Befehl du benutzen willst. Aber um da Level zu schaffen musst du irgendwie sicherstellen, dass `master` den Commit bekommt, auf den `bugFix` zeigt."]}}]},ja:{childViews:[{type:"ModalAlert",options:{markdowns:["## ローカルに積み上がったコミット","","実際の開発ではこういうケースがよくあります：「バグの原因調査を試みているがバグの再現性がかなり低い。調査の補助のために、いくつかのデバッグ用の命令やprint文を差し込んでいる。」","","これらのデバッグ用のコードはバグ修正用のブランチにコミットされています。そしてついにバグの原因を突き止めて、修正した！やった！","","あとは`bugFix`ブランチを`master`ブランチに統合できればOK。そこで単純に`master`をfast-forwardすればよいかというと、それでは`master`ブランチの中にデバッグ用のコードも混入してしまいます。"]}},{type:"ModalAlert",options:{markdowns:["ここでGitの魔法が力を発揮します。解決のためにはいくつかの方法がありますが、最も素直な解決方法は2つあって：","","* `git rebase -i`","* `git cherry-pick`","","インタラクティブモードの（`-i`オプションつきの）rebaseによって、保持したいコミットと破棄したいコミットを選り分けることができます。コミットの順序を変更することも可能です。この方法は、一部の変更をどこかへやってしまいたい時に便利です。","","もう一方のcherry-pickを使うと、持っていきたいコミットを選んで`HEAD`の先にストンと落とすことができます。"]}},{type:"ModalAlert",options:{markdowns:["後半の章ですのでどう解決するかをもう自分で考えることができると思います。このレベルをクリアするためには、`bugFix`が持っているコミットを`master`ブランチが受け取る必要がある点には注意してください。"]}}]},zh_CN:{childViews:[{type:"ModalAlert",options:{markdowns:["## 本地栈式提交","","来看一个在开发中经常会遇到的情况：我正在解决某个特别棘手的 Bug，为了便于调试而在代码中添加了一些调试命令并向控制台打印了一些信息。","","这些调试和打印语句都在它们各自的提交记录里。最后我终于找到了造成这个 Bug 的根本原因，解决掉以后觉得沾沾自喜！","","最后就差把 `bugFix` 分支里的工作合并回 `master` 分支了。你可以选择通过 fast-forward 快速合并到 `master` 分支上，但这样的话 `master` 分支就会包含我这些调试语句了。你肯定不想这样，应该还有更好的方式……"]}},{type:"ModalAlert",options:{markdowns:["实际我们只要让 Git 复制解决问题的那一个提交记录就可以了。跟之前我们在“整理提交记录”中学到的一样，我们可以使用","","* `git rebase -i`","* `git cherry-pick`","","来达到目的。"]}},{type:"ModalAlert",options:{markdowns:["由于我们刚刚闯过类似的关卡，所以要不要再尝试一次就看你自己了。但是如果你想试一把的话，确保 `master` 分支能得到 `bugFix` 分支上的相关提交。"]}}]},zh_TW:{childViews:[{type:"ModalAlert",options:{markdowns:["## 在 local 的堆疊的 commit","","有一個經常發生的情況：我在追蹤一個有點棘手的 bug，但是它實在太難抓出來了，在不得已的情況下我加入了一些 debug 的指令，並且做了一些 commit。","","所有的這些 debug 的指令都只在 `bugFix` 這個 branch 裡面。最後我終於找到這個 bug，並且 fix 掉它，接著撒花慶祝一下！","","現在唯一的問題就是要把我在 `bugFix` branch 裡面所做的修改 merge 回 `master` branch。我可以簡單地透過 fast-forward 來 merge ，但這樣的話 `master` branch 就會包含這些含有 debug 指令的 commit 了。我相信一定有其它方法..."]}},{type:"ModalAlert",options:{markdowns:["我們需要告訴 git 只去複製其中一個 commit。 這種情況跟之前的關卡有一點類似，我們可以使用一樣的指令","","* `git rebase -i`","* `git cherry-pick`","","來完成這個目的。"]}},{type:"ModalAlert",options:{markdowns:["這一個關卡是比較後面的關卡，你可以隨意決定你要選擇使用哪個指令，但是 `bugFix` 所指向的那個 commit 一定要可以被 `master` branch 包含到。"]}}]},ko:{childViews:[{type:"ModalAlert",options:{markdowns:["## 로컬에 쌓인 커밋들","","개발중에 종종 이런 상황이 생깁니다: 잘 띄지 않는 버그를 찾아서 해결하려고, 어떤 부분의 문제인지를 찾기 위해 디버그용 코드와 화면에 정보를 프린트하는 코드 몇 줄 넣습니다. ","","디버깅용 코드나 프린트 명령은 그 브랜치에 들어있습니다. 마침내 버그를 찾아서 고쳤고, 원래 작업하는 브랜치에 합치면 됩니다!","","이제 `bugFix`브랜치의 내용을 `master`에 합쳐 넣으려 하지만, 한 가지 문제가 있습니다. 그냥 간단히 `master`브랜치를 최신 커밋으로 이동시킨다면(fast-forward) 그 불필요한 디버그용 코드들도 함께 들어가 버린다는 문제죠."]}},{type:"ModalAlert",options:{markdowns:["여기에서 Git의 마법이 드러납니다. 이 문제를 해결하는 여러가지 방법이 있습니다만, 가장 간단한 두가지 방법 아래와 같습니다:","","* `git rebase -i`","* `git cherry-pick`","","대화형 (-i 옵션) 리베이스(rebase)로는 어떤 커밋을 취하거나 버릴지를 선택할 수 있습니다. 또 커밋의 순서를 바꿀 수도 있습니다. 이 커맨드로 어떤 작업의 일부만 골라내기에 유용합니다.","","체리픽(cherry-pick)은 개별 커밋을 골라서 `HEAD`위에 떨어뜨릴 수 있습니다."]}},{type:"ModalAlert",options:{markdowns:["이번 레벨을 통과하기 위해 어떤 방법을 쓰시든 자유입니다만, `master`브랜치가 `bugFix` 브랜치의 커밋을 일부 가져오게 해주세요."]}}]},ru_RU:{childViews:[{type:"ModalAlert",options:{markdowns:["Вот ситуация, которая часто случается при разработке: мы пытаемся отследить ошибку, но она не очень очевидна. Для того, чтобы достичь успеха на этом поприще, мы используем несколько команд для отладки и вывода","","Каждая отладочная команда (команды) вывода находится в своём коммите. В итоге мы нашли ошибку, исправили её и порадовались!","","Но проблема в том, что мы хотим добавить в `master` только исправление ошибки из ветки `bugFix`. Если мы воспользуемся простым fast-forward, то в `master` попадут также отладочные команды. Должен быть другой способ..."]}},{type:"ModalAlert",options:{markdowns:["Надо заставить git копировать только один из коммитов. Это почти как в предыдущем уровне – мы можем использовать уже известные нам команды: ","","* `git rebase -i`","* `git cherry-pick`","","Чтобы достичь желаемого результата."]}},{type:"ModalAlert",options:{markdowns:["В этом уровне тебе решать, какую команду использовать, но чтобы закончить уровень, убедись, что в мастер попал коммит, на который ссылается `bugFix`"]}}]},uk:{childViews:[{type:"ModalAlert",options:{markdowns:["## Локально складені коміти","","Ось ситуація з життя рядового програміста: я намагаюся відслідкувати баг, але це не завжди вдається. Щоб допомогти собі, я додаю кілька дебаг-команд та ще кілька println'ів.","","Всі ці команди для відлагодження та виводу данних знаходяться в своїх власних комітах. Врешті-решт я знаходжу баг, фікшу його та щиро радію!","","От тільки лишається проблема, що потрібно мій фікс перенести з `bugFix` назад в гілку `master`. Якщо я просто зроблю фастфорвард (fast-forwarded) в `master`, тоді в `master` потраплять всі мої println'и, що є зайвим. Має бути інший шлях..."]}},{type:"ModalAlert",options:{markdowns:["Ми маємо сказати гіту скопіювати лише один коміт. Це все те ж саме, що й у попередніх рівнях, і ми можемо використати ті ж самі команди:","","* `git rebase -i`","* `git cherry-pick`","","для досягнення мети."]}},{type:"ModalAlert",options:{markdowns:["На цьому рівні тобі вирішувати якими командами користуватися, але щоб пройти цей рівень, впевнись що в `master` потрапить коміт, на який посилається `bugFix`."]}}]},vi:{childViews:[{type:"ModalAlert",options:{markdowns:["## Commit xếp chồng tại địa phương","","Có tình huống thế này thường hay xảy ra trong quá trình phát triển: Tôi dang cố dò lỗi nhưng mà nó lại khá là trúc trắc. Để hỗ trợ cho việc này, thêm vào vài dòng lệnh gỡ lỗi và lệnh in.","","Mấy lệnh gỡ lỗi và in này nằm yên trong commit của chúng. Cuối cùng thì tôi cũng tìm ra lỗi, gỡ xong, ngon rồi!","","Bây giờ thì lại phải đưa `bugFix` trở về nhánh `master`. Nếu mà đơn giản dùng fast-forwarded lên `master`, thì `master` lại có tất cả các lệnh gỡ lỗi kia(chẳng muốn chút nào). Phải có cách khác chứ nhỉ..."]}},{type:"ModalAlert",options:{markdowns:["Ta cần phải bảo git chỉ sao chép 1 commit thôi. Điều này giống với cấp độ trước về điều chỉnh vị trí -- ta có thể dùng các câu lệnh tương tự:","","* `git rebase -i`","* `git cherry-pick`","","Để đạt được mục tiêu này."]}},{type:"ModalAlert",options:{markdowns:["Bây giờ là cấp độ cao hơn rồi nên bạn hãy tự quyết định nên dùng câu lệnh nào, nhưng để hoàn thành được cấp độ, hãy đàm bảo rằng `master` nhận được commit mà `bugFix` tham chiếu tới."]}}]}}}},{}],120:[function(e,t,o){o.level={disabledMap:{"git cherry-pick":!0,"git revert":!0},compareOnlyMasterHashAgnosticWithAsserts:!0,goalAsserts:{master:[function(e){return e.C2>e.C3},function(e){return e.C2>e.C1}]},goalTreeString:"%7B%22branches%22%3A%7B%22master%22%3A%7B%22target%22%3A%22C3%27%27%22%2C%22id%22%3A%22master%22%7D%2C%22newImage%22%3A%7B%22target%22%3A%22C2%22%2C%22id%22%3A%22newImage%22%7D%2C%22caption%22%3A%7B%22target%22%3A%22C3%27%27%22%2C%22id%22%3A%22caption%22%7D%7D%2C%22commits%22%3A%7B%22C0%22%3A%7B%22parents%22%3A%5B%5D%2C%22id%22%3A%22C0%22%2C%22rootCommit%22%3Atrue%7D%2C%22C1%22%3A%7B%22parents%22%3A%5B%22C0%22%5D%2C%22id%22%3A%22C1%22%7D%2C%22C2%22%3A%7B%22parents%22%3A%5B%22C1%22%5D%2C%22id%22%3A%22C2%22%7D%2C%22C3%22%3A%7B%22parents%22%3A%5B%22C2%22%5D%2C%22id%22%3A%22C3%22%7D%2C%22C3%27%22%3A%7B%22parents%22%3A%5B%22C1%22%5D%2C%22id%22%3A%22C3%27%22%7D%2C%22C2%27%22%3A%7B%22parents%22%3A%5B%22C3%27%22%5D%2C%22id%22%3A%22C2%27%22%7D%2C%22C2%27%27%22%3A%7B%22parents%22%3A%5B%22C3%27%22%5D%2C%22id%22%3A%22C2%27%27%22%7D%2C%22C2%27%27%27%22%3A%7B%22parents%22%3A%5B%22C1%22%5D%2C%22id%22%3A%22C2%27%27%27%22%7D%2C%22C3%27%27%22%3A%7B%22parents%22%3A%5B%22C2%27%27%27%22%5D%2C%22id%22%3A%22C3%27%27%22%7D%7D%2C%22HEAD%22%3A%7B%22target%22%3A%22master%22%2C%22id%22%3A%22HEAD%22%7D%7D",solutionCommand:"git rebase -i HEAD~2 --solution-ordering C3,C2;git commit --amend;git rebase -i HEAD~2 --solution-ordering C2'',C3';git rebase caption master",startTree:'{"branches":{"master":{"target":"C1","id":"master"},"newImage":{"target":"C2","id":"newImage"},"caption":{"target":"C3","id":"caption"}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"},"C2":{"parents":["C1"],"id":"C2"},"C3":{"parents":["C2"],"id":"C3"}},"HEAD":{"target":"caption","id":"HEAD"}}',name:{ko:"커밋들 갖고 놀기",en_US:"Juggling Commits",de_DE:"Jonglieren mit Commits",fr_FR:"Jongler avec les commits",es_AR:"Haciendo malabares con los commits",es_ES:"Haciendo malabares con los commits",pt_BR:"Malabarismo com commits",gl:"Argallando cos commits",ja:"コミットをやりくりする",zh_CN:"提交的技巧 #1",zh_TW:"commit 的戲法",ru_RU:"Жонглируем коммитами",uk:"Жонглюємо комітами",vi:"Tung hứng commit"},hint:{en_US:"The first command is git rebase -i HEAD~2",de_DE:"Der erste Befehl ist git rebase -i HEAD~2",fr_FR:"La première commande est git rebase -i HEAD~2",es_AR:"El primer comando es git rebase -i HEAD~2",es_ES:"El primer comando es git rebase -i HEAD~2",pt_BR:"O primeiro comando é git rebase -i HEAD~2",gl:"O primeiro comando é git rebase -i HEAD~2",ja:"最初に打つコマンドはgit rebase -i HEAD~2",ko:"첫번째 명령은 git rebase -i HEAD~2 입니다",zh_CN:"第一个命令是 `git rebase -i HEAD~2`",zh_TW:"第一個命令是 'git rebase -i HEAD~2'",ru_RU:"Первой командой должна быть git rebase -i HEAD~2",uk:"Перша команда має бути git rebase -i HEAD~2",vi:"Lệnh đầu tiên là git rebase -i HEAD~2"},startDialog:{en_US:{childViews:[{type:"ModalAlert",options:{markdowns:["## Juggling Commits","","Here's another situation that happens quite commonly. You have some changes (`newImage`) and another set of changes (`caption`) that are related, so they are stacked on top of each other in your repository (aka one after another).","","The tricky thing is that sometimes you need to make a small modification to an earlier commit. In this case, design wants us to change the dimensions of `newImage` slightly, even though that commit is way back in our history!!"]}},{type:"ModalAlert",options:{markdowns:["We will overcome this difficulty by doing the following:","","* We will re-order the commits so the one we want to change is on top with `git rebase -i`","* We will `commit --amend` to make the slight modification","* Then we will re-order the commits back to how they were previously with `git rebase -i`","* Finally, we will move master to this updated part of the tree to finish the level (via the method of your choosing)","","There are many ways to accomplish this overall goal (I see you eye-ing cherry-pick), and we will see more of them later, but for now let's focus on this technique.","Lastly, pay attention to the goal state here -- since we move the commits twice, they both get an apostrophe appended. One more apostrophe is added for the commit we amend, which gives us the final form of the tree ","","That being said, I can compare levels now based on structure and relative apostrophe differences. As long as your tree's `master` branch has the same structure and relative apostrophe differences, I'll give full credit"]}}]},fr_FR:{childViews:[{type:"ModalAlert",options:{markdowns:["## Jongler avec les commits","","Voici une autre situation fréquente. Vous avez certains changements (`newImage`) et un autre groupe de changements (`caption`) qui sont reliés, ils sont donc empilés l'un sur l'autre dans votre dépôt Git (i.e. l'un après l'autre).","","Là où ça se complique c'est lorsque vous devez faire une petite modification dans un commit antérieur. Dans ce cas, les configurations de  `newImage` devront changer un peu, même si ce commit est loin dans notre historique !!"]}},{type:"ModalAlert",options:{markdowns:["Nous allons régler le problème en faisant ceci :","","* Nous allons réordonner les commits pour que celui que nous voulions changer soit sur le dessus `git rebase -i`","* Nous allons utiliser `commit --amend` pour faire les petites modifications","* Nous allons réordonner les commits dans l'ordre original avec `git rebase -i`","* Finalement, nous allons déplacer master vers la nouvelle tête de l'arbre (avec la méthode de votre choix)","","Il y a plusieurs façons d'atteindre ce but (cherry-pick semble très tentant), mais nous allons parler de cherry-pick plus tard, pour le moment concentrez-vous sur cette technique.","","Pour terminer, Faites attention au but -- Dû au fait que nous déplaçons les commits 2 fois, ils se retrouvent tous les deux avec une apostrophe. Une deuxième apostrophe est ajoutée sur le commit que nous modifions, ce qui nous donne la forme finale de l'arbre.","","Ceci étant dit, je peux comparer le résultat avec la structure et les différentes apostrophes. Tant que votre arbre `master` a la même structure et les différentes apostrophes le niveau sera considéré réussi."]}}]},es_AR:{childViews:[{type:"ModalAlert",options:{markdowns:["## Haciendo malabares con los commits","","Esta es otra situación algo común. Tenés algunos cambios (`newImage`) y otro conjunto de cambios (`caption`) que están relacionados, entonces están apilados en tu repositorio uno encima del otro (es decir, uno después del otro).","","El tema es que a veces tenés que hacer una pequeña modificación a un commit previo. En este caso, la gente de diseño requiere que cambiemos ligeramente las dimensiones de `newImage`, ¡incluso aunque ese commit ya esté atrás en nuestra historia!"]}},{type:"ModalAlert",options:{markdowns:["Superaremos esta dificultad haciendo lo siguiente:","","* Vamos a reordenar los commits para que el que queremos cambiar quede arriba de todo con `git rebase -i`","* Vamos a hacer `commit --amend` para aplicar la ligera modificación","* Después vamos a reordenar los commits a como estaban con `git rebase -i`","* Finalmente, vamos a mover master a esta parte actualizada de nuestro árbol de commits para terminar el nivel (usando el método que prefieras)","","Hay varias maneras de lograr este objetivo en general (ya te veo haciéndole ojitos al cherry-pick), y veremos algunos más después, pero por ahora concentrémonos en esta técnica.","","Por último, prestá atención al estado final acá -- como movemos los commits dos veces, ambos quedan con un apóstrofe. El commit que corregimos tiene un apóstrofe extra, y así nos queda nuestro árbol final","","Habiendo dicho eso, puedo comparar los niveles basándome ahora en la estructura y las diferencias relativas de apóstrofes. Mientras que tu rama `master` tenga la misma estructura y diferencias relativas de apóstrofes, te voy a dar el puntaje completo"]}}]},es_ES:{childViews:[{type:"ModalAlert",options:{markdowns:["## Haciendo malabares con los commits","","Esta es otra situación algo común. Tienes algunos cambios (`newImage`) y otro conjunto de cambios (`caption`) que están relacionados, entonces están apilados en tu repositorio uno encima del otro (es decir, uno después del otro).","","El tema es que a veces tienes que hacer una pequeña modificación a un commit previo. En este caso, la gente de diseño requiere que cambiemos ligeramente las dimensiones de `newImage`, ¡incluso aunque ese commit ya se encuentre atrás en nuestra historia!"]}},{type:"ModalAlert",options:{markdowns:["Superaremos esta dificultad haciendo lo siguiente:","","* Vamos a reordenar los commits para que el que queremos cambiar quede arriba de los demás con `git rebase -i`","* Vamos a hacer `commit --amend` para aplicar la ligera modificación","* Después vamos a reordenar los commits a como estaban con `git rebase -i`","* Finalmente, vamos a mover master a esta parte actualizada de nuestro árbol de commits para terminar el nivel (usando el método que prefieras)","","Hay varias maneras de lograr este objetivo en general (ya te veo haciéndole ojitos al cherry-pick), y veremos algunos más después, pero por ahora concentrémonos en esta técnica.","","Por último, presta atención al estado final -- como movemos los commits dos veces, ambos quedan con un apóstrofe. El commit que corregimos tiene un apóstrofe extra, y así nos queda nuestro árbol final","","Habiendo dicho eso, puedo comparar los niveles basándome ahora en la estructura y las diferencias relativas de apóstrofes. Mientras que tu rama `master` tenga la misma estructura y diferencias relativas de apóstrofes, te voy a dar el puntaje completo"]}}]},pt_BR:{childViews:[{type:"ModalAlert",options:{markdowns:["## Malabarismo com commits","","Aqui está outra situação que acontece com bastante frequência. Você fez algumas mudanças (`newImage`), além de um outro conjunto de mudanças (`caption`) que são relacionadas, de forma que elas estão empilhadas uma após a outra no seu repositório.","","O complicado é que algumas vezes você precisa fazer uma pequena modificação em um commit mais antigo. Neste caso, o pessoal do design quer que modifiquemos um pouco as dimensões da imagem introduzida em `newImage`, apesar de esse commit estar mais para trás no nosso histórico!!"]}},{type:"ModalAlert",options:{markdowns:["Superaremos essa dificuldade fazendo o seguinte:","","* Reordenaremos os commits de forma que aquele que desejamos esteja no topo, com `git rebase -i`","* Usaremos o comando `git commit --amend` para fazer uma pequena modificação","* Vamos, então, reordenar os commits na mesma ordem que estavam anteriormente com `git rebase -i`","* Finalmente, moveremos o master para essa parte atualizada da árvore para finalizar o nível (usando o método de sua escolha)","","Há muitas formas de alcançar o objetivo final (eu vejo o cherry-pick passando pela sua mente), e veremos mais delas depois, mas por enquanto foquemos nesta técnica.","",'Por último, preste atenção no estado do "objetivo" aqui -- como nós movemos os commits duas vezes, ambos ficam com um apóstrofo. Um apóstrofo adicional é colocado no commit que sofreu o "amend", o que nos dá a forma final da árvore ',"","Tendo dito isto, posso avaliar a resposta baseado na estrutura e nas diferenças relativas de número de apóstrofos. Desde que o ramo `master` da sua árvore tenha a mesma estrutura, e o número de apóstrofos seja igual a menos de uma constante, darei a você todos os pontos para esta tarefa"]}}]},gl:{childViews:[{type:"ModalAlert",options:{markdowns:["## Argallando cos commits","","Aquí está outra situación que acontece con bastante frecuencia. Estás facendo algúns cambios (`newImage`), separado do resto de cambios (`caption`) que están relacionados, deste xeito están apilados un enriba do outro no teu repositorio.","","O complicado é que ás veces, poida que precises facer unha pequena nota nun commit máis antigo. Neste caso, a persoa de deseño quere mudar un pouco as dimensións da imaxe introducida en `newImage`, a pesar de que ese commit está máis abaixo no noso histórico!!"]}},{type:"ModalAlert",options:{markdowns:["Superamos este problema facendo o seguinte:","","* Reordenaremos os commits seleccionando aqueles que desexamos que estén no cambio, con `git rebase -i`","* Empregaremos o comando `git commit --amend` para facer unha pequena modificación","* Imos, entón, reordear os commits na mesma orde na que estaban anteriormente con `git rebase -i`","* Finalmente, moveremos o master para esa parte atualizada da árbore e así finalizar o nivel (usando o método que máis che pete)","","Hai moitas formas de obter o obxectivo final (eu vexo o cherry-pick pasando pola túa cachola), e verémolo máis adiante, pero agora ímonos centrar nesta técnica.","",'Por último, preste atención no estado do "objectivo" aquí -- como movemos os commits dúas veces, ambos teñen o apóstrofo sumado. O apóstrofo engádese polo commit que nos correximos (amend), o cal danos a forma final da árbore.',"","Contado todo esto, a resposta valídase baseándose na estructura e nos diferentes apóstrofes. Cando a rama `master` teña a mesma estructura, e o número de apóstrofos sexa igual, obterás todos os puntos da tarefa."]}}]},de_DE:{childViews:[{type:"ModalAlert",options:{markdowns:["## Jonglieren mit Commits","","Eine weitere häufig vorkommende Situation: du hast einige Änderungen in `newImage` und weitere Änderungen in `caption`. Die Änderungen hängen voneinander ab, das heißt in diesem Fall `caption` ist ein Nachfolger von `newImage`.","","Nun kann es vorkommen, dass du einen früheren Commit verändern willst. In unserem Fall will die Design-Abteilung, dass die Abmessungen in `newImage` leicht verändert werden, obwohl das mitten in unserer History liegt!"]}},{type:"ModalAlert",options:{markdowns:["Um das zu schaffen gehen wir wie folgt vor:","","* Wir sortieren die Commits mit `git rebase -i` so um, dass der, den wir ändern wollen, ganz oben liegt.","* Wir verändern den Commit mit `git commit --amend`.","* Dann sortieren wir die Commit mit einem erneuten `git rebase -i` wieder in die alte Reihenfolge.","* Schließlich aktualisieren wir den `master` auf das Ende unseres fertigen Baums, um diesen Level abzuschließen.","","Es gibt sehr viele Wege um das Endziel dieses Levels zu erreichen (ich sehe, du schielst auf `cherry-pick`) und wir werden uns später noch andere ansehen. Aber für's erste lass uns diese Methode ausprobieren.","","Beachte den geschilderten Zielzustand. Da wir die Commits zweimal umsortieren bekommen sie jedesmal ein Apostroph hinzugefügt (weil sie jedesmal kopiert werden). Ein weiteres Apostroph entsteht durch den `commit --amend`.","","Zuguterletzt noch eine Bemerkung: ich kann Level nur auf Struktur und Apostroph-Differenz prüfen. So lange wie dein `master` am Ende dieselbe Struktur und Apostroph-Differenz aufweist wie der Ziel-`master`, ist der Level bestanden."]}}]},ja:{childViews:[{type:"ModalAlert",options:{markdowns:["## コミットをやりくりする","","開発中に頻繁に起こるケースをもう1つ考えます。ある変更（`newImage`）とまた別の変更（`caption`）があって、それらに依存関係があるとします。この一連の変更が一列に積み重なっているとします。","","ここでトリッキーなのは、以前のコミットに対して微修正をかけなければならないケースがあるということです。今回の教材でも、過去のコミットであるにも関わらず`newImage`ブランチに僅かな修正を加えるような設計の修正が入ったとしましょう。"]}},{type:"ModalAlert",options:{markdowns:["この困難な状況を、以下の手順で克服することを考えます：","","* `git rebase -i`を使って順番を変更する。これで、変更をかけたいコミットを一番先頭に持ってくる。","* `commit --amend`コマンドで僅かな変更を行う","* `git rebase -i`コマンドを再度使って、先頭に持ってきていたコミットを元に戻す","* 最後に、レベルクリアのためにmasterブランチを先頭に持ってくる","","クリアのための方法はいくつもありますが（cherry-pickを使うこともできます）、別の回答はまた後程の章で見ることにして、今回は上記の方法でやってみることにしましょう。","","最後に、ゴール時点での状態に気を付けてください。今回2回ほどコミットを動かしますから、コミットへのポインタにはアポストロフィ（'）が追加されます。commit --amendコマンドの実行でできたコミットには更にもう1つのアポストロフィが追加されます。 "]}}]},zh_CN:{childViews:[{type:"ModalAlert",options:{markdowns:["## 提交的技巧 #1","","接下来这种情况也是很常见的：你之前在 `newImage` 分支上进行了一次提交，然后又基于它创建了 `caption` 分支，然后又提交了一次。","","此时你想对的某个以前的提交记录进行一些小小的调整。比如设计师想修改一下 `newImage` 中图片的分辨率，尽管那个提交记录并不是最新的了。"]}},{type:"ModalAlert",options:{markdowns:["我们可以通过下面的方法来克服困难：","","* 先用 `git rebase -i` 将提交重新排序，然后把我们想要修改的提交记录挪到最前","* 然后用 `commit --amend` 来进行一些小修改","* 接着再用 `git rebase -i` 来将他们调回原来的顺序","* 最后我们把 master 移到修改的最前端（用你自己喜欢的方法），就大功告成啦！","","当然完成这个任务的方法不止上面提到的一种（我知道你在看 cherry-pick 啦），之后我们会多点关注这些技巧啦，但现在暂时只专注上面这种方法。","最后有必要说明一下目标状态中的那几个`'` —— 我们把这个提交移动了两次，每移动一次会产生一个 `'`；而 C2 上多出来的那个是我们在使用了 amend 参数提交时产生的，所以最终结果就是这样了。","","也就是说，我在对比结果的时候只会对比提交树的结构，对于 `'` 的数量上的不同，并不纳入对比范围内。只要你的 `master` 分支结构与目标结构相同，我就算你通过。"]}}]},zh_TW:{childViews:[{type:"ModalAlert",options:{markdowns:["## commit 的戲法","","下面這種情況也是經常出現的。例如你之前已經在 `newImage` branch 上做了一些 commit，然後又開了一個 branch 叫做 `caption` ，並且在上面做了一些相關的 commit ，因此它們看起來是一個接著一個的。","","有點棘手的就是有時候你又想在之前的 commit 裡面做一些修改。在這個例子裡面，我們要去稍微修改一下 `newImage` 所指向的 commit，儘管已經是之前的 commit 了 。"]}},{type:"ModalAlert",options:{markdowns:["為了克服這個困難，我們可以按照下面的方法來做：","","* 先用 `git rebase -i` 將 commit 重新排序，然後把我們想要修改的 commit 移到最前面","* 然後用 `commit --amend` 來進行一些修改","* 接著再用 `git rebase -i` 來將他們按照最開始的順序重新排好","* 最後我們把 master 移到這個修改的最前端（用你自己喜歡的方法），就大功告成啦！","","當然還有許多方法可以完成這個任務（我知道你在想 cherry-pick 啦），之後我們會多點關注這些技巧啦，但現在暫時只注意上面這種方法。","","啊！最後還要提醒你一下最後所產生的 commit tree，因為我們把 commit 移動了兩次，所以會分別產生一個 apostrophe(單引號） commit。還有一個 apostrophe commit 是因為我們修改 commit 而加進來的。"]}}]},ko:{childViews:[{type:"ModalAlert",options:{markdowns:["## 커밋들 갖고 놀기","","이번에도 꽤 자주 발생하는 상황입니다. `newImage`와 `caption` 브랜치에 각각의 변경내역이 있고 서로 약간 관련이 있어서, 저장소에 차례로 쌓여있는 상황입니다.","","때로는 이전 커밋의 내용을 살짝 바꿔야하는 골치아픈 상황에 빠지게 됩니다. 이번에는 디자인 쪽에서 우리의 작업이력(history)에서는 이미 한참 전의 커밋 내용에 있는 `newImage`의 크기를 살짝 바꿔달라는 요청이 들어왔습니다."]}},{type:"ModalAlert",options:{markdowns:["이 문제를 다음과 같이 풀어봅시다:","","* `git rebase -i` 명령으로 우리가 바꿀 커밋을 가장 최근 순서로 바꾸어 놓습니다","* `commit --amend` 명령으로 커밋 내용을 정정합니다","* 다시 `git rebase -i` 명령으로 이 전의 커밋 순서대로 되돌려 놓습니다","* 마지막으로, master를 지금 트리가 변경된 부분으로 이동합니다. (편하신 방법으로 하세요)","","이 목표를 달성하기 위해서는 많은 방법이 있는데요(체리픽을 고민중이시죠?), 체리픽은 나중에 더 살펴보기로 하고, 우선은 위의 방법으로 해결해보세요.","","최종적으로, 목표 결과를 눈여겨 보세요 -- 우리가 커밋을 두 번 옮겼기 때문에, 두 커밋 모두 따옴표 표시가 붙어있습니다. 정정한(amend) 커밋은 따옴표가 추가로 하나 더 붙어있습니다."]}}]},ru_RU:{childViews:[{type:"ModalAlert",options:{markdowns:["## Жонглируем коммитами","","Вот ещё одна ситуация, которая часто случается. Есть некоторые изменения (`newImage`) и другие изменения (`caption`), которые связаны так, что находятся друг поверх друга в репозитории.","","Штука в том, что иногда нужно внести небольшие изменения в более ранний коммит. В таком случае надо немного поменять `newImage`, несмотря на то, что коммит уже в прошлом!"]}},{type:"ModalAlert",options:{markdowns:["Преодолеть эти трудности можно следующим образом:","","* Переставить коммит так, чтобы нужный находился наверху при помощи `git rebase -i`","* Внести изменения при помощи `commit --amend`","* Переставить всё обратно при помощи `git rebase -i`","* И наконец, переместить master на изменённую часть дерева, чтобы закончить уровень.","","Это задание можно выполнить несколькими способами (и, гляжу, ты посматриваешь на cherry-picking), но сейчас сосредоточься на вышеописанном методе.","","Обрати внимание на итоговое состояние в этом уровне – так как мы дважды перемещаем коммиты, оба они получат по апострофу. Ещё один апостроф добавляется, когда мы делаем `commit --amend`.","","Важно, чтобы совпадало не только дерево коммитов, но и количество апострофов."]}}]},uk:{childViews:[{type:"ModalAlert",options:{markdowns:["## Жонглюємо комітами","","Ось інша ситуація, що доволі часто трапляється. В тебе є якісь зміни (`newImage`) та ще якийсь набір комітів (`caption`), які зв’язані між собою, тому вони знаходяться один над одним в твоєму репозиторії (або один за одним).","","Штука в тому що іноді потрібно зробити невелику модифікацію до попереднього коміту. В цьому випадку, дизайнери хочуть щоб ми трохи змінили розміри `newImage`, не зважаючи на те, що цей коміт знаходиться досить глибоко в історії!!"]}},{type:"ModalAlert",options:{markdowns:["Ми поборимо цю складність наступним чином:","","* Ми відсортуємо коміти таким чином, щоб той, який ми хочемо змінити, був останнім за допомогою `git rebase -i`","* Ми виконаємо `commit --amend` щоб внести невелику правку до останнього коміту","* Тоді ми відсортуємо коміти в попередньому порядку, за допомогою `git rebase -i`","* І на останок, ми пересунемо master на змінену частину дерева щоб закінчити цей рівень(ти можеш вибрати метод)","","Насправді є кілька способів як виконати поставлену задачу (Я бачу, ти поглядаєш на cherry-pick), і ми розберемося з ними всіма трохи пізніше, але зараз скористаймося саме цим методом.","Зверни увагу на фінальний стан в цьому рівні -- позаяк ми перемістили коміти двічі, кожен з них отримає по апострофу. Ще один апостроф додасться коли ми виконаємо commit --amend.","","Враховуючи сказане вище, я буду порівнювати дерево як за назвою коміта, так і за кількістю апострофів. Щойно дерево цілей та master співпадуть, ти пройдеш цей рівень."]}}]},vi:{childViews:[{type:"ModalAlert",options:{markdowns:["## Tung hứng Commit","","Có một tình huống xảy ra khá thường xuyên. Bạn có vài thay đổi trên (`newImage`) và một vài thay đổi khác trên (`caption`) và chúng lại liên quan đến nhau, nên chúng nằm chồng lên nhau trong kho của bạn (một lại nối một).","","Tréo ngoe là bạn lại phải điều chỉnh một chút ở commit trước. Giả sử như tay thiết kết muốn ta đổi chiều của `newImage` một chút, mặc dù commit ấy đã xưa lắm rồi!!"]}},{type:"ModalAlert",options:{markdowns:["Để khắc phục khó khăn này ta có thể làm như sau:","","* Ta sẽ dùng `git rebase -i` sắp xếp lại commit để cái ta cần sửa sẽ nằm trên cùng","* Ta sẽ dùng `commit --amend` tạo ra một điều chỉnh nhỏ","* Sau đó ta sẽ lại sắp xếp lại commit như trước bằng cách dùng `git rebase -i`","* Cuối cùng, ta sẽ chuyển `master` tới phần đã cập nhật để hoàn thành cấp độ (dùng cách nào tùy bạn)","","Có nhiều cách để hoàn thành mục tiêu (Tôi thấy bạn hấp háy sang cherry-pick rồi đấy), rồi ta sẽ thấy chúng nhiều hơn, nhưng giờ hãy cứ tập trung vào kỹ thuật này đã.","Sau cùng thì, để ý các dấu nháy đơn(') chứ?-- vì ta đã chuyển commit 2 lần, nên chúng có thêm một dấu nháy đơn. Và một dấu nữa cho commit mà ta đã sửa đổi, thế là ta có trạng thái cuối cùng của cây lịch sử ","","Nói cách khác, khi tôi so sánh kết quả, tôi chỉ so sánh cấu trúc của cây lịch sử. Sự khác biệt về số lượng `'`  không được bao gồm trong so sánh. Miễn là cấu trúc nhánh `master` của bạn giống với cấu trúc đích, tôi sẽ vẫn để bạn qua bài."]}}]}}}},{}],121:[function(e,t,o){o.level={goalTreeString:"%7B%22branches%22%3A%7B%22master%22%3A%7B%22target%22%3A%22C3%27%22%2C%22id%22%3A%22master%22%7D%2C%22newImage%22%3A%7B%22target%22%3A%22C2%22%2C%22id%22%3A%22newImage%22%7D%2C%22caption%22%3A%7B%22target%22%3A%22C3%22%2C%22id%22%3A%22caption%22%7D%7D%2C%22commits%22%3A%7B%22C0%22%3A%7B%22parents%22%3A%5B%5D%2C%22id%22%3A%22C0%22%2C%22rootCommit%22%3Atrue%7D%2C%22C1%22%3A%7B%22parents%22%3A%5B%22C0%22%5D%2C%22id%22%3A%22C1%22%7D%2C%22C2%22%3A%7B%22parents%22%3A%5B%22C1%22%5D%2C%22id%22%3A%22C2%22%7D%2C%22C3%22%3A%7B%22parents%22%3A%5B%22C2%22%5D%2C%22id%22%3A%22C3%22%7D%2C%22C2%27%22%3A%7B%22parents%22%3A%5B%22C1%22%5D%2C%22id%22%3A%22C2%27%22%7D%2C%22C2%27%27%22%3A%7B%22parents%22%3A%5B%22C1%22%5D%2C%22id%22%3A%22C2%27%27%22%7D%2C%22C3%27%22%3A%7B%22parents%22%3A%5B%22C2%27%27%22%5D%2C%22id%22%3A%22C3%27%22%7D%7D%2C%22HEAD%22%3A%7B%22target%22%3A%22master%22%2C%22id%22%3A%22HEAD%22%7D%7D",solutionCommand:"git checkout master;git cherry-pick C2;git commit --amend;git cherry-pick C3",disabledMap:{"git revert":!0},startTree:'{"branches":{"master":{"target":"C1","id":"master"},"newImage":{"target":"C2","id":"newImage"},"caption":{"target":"C3","id":"caption"}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"},"C2":{"parents":["C1"],"id":"C2"},"C3":{"parents":["C2"],"id":"C3"}},"HEAD":{"target":"caption","id":"HEAD"}}',compareOnlyMasterHashAgnosticWithAsserts:!0,goalAsserts:{master:[function(e){return e.C2>=e.C3},function(e){return e.C2>e.C1}]},name:{ko:"커밋 갖고 놀기 #2",en_US:"Juggling Commits #2",fr_FR:"Jongler avec les commits #2",es_AR:"Haciendo malabares con los commits #2",es_ES:"Haciendo malabares con los commits #2",pt_BR:"Malabarismo com commits #2",gl:"Argallando cos commits #2",de_DE:"Jonglieren mit Commits Teil 2",ja:"コミットをやりくりする その2",zh_CN:"提交的技巧 #2",zh_TW:"commit 的戲法 #2",ru_RU:"Жонглируем коммитами №2",uk:"Жонглюємо комітами #2",vi:"Tung hứng commit #2"},hint:{en_US:"Don't forget to forward master to the updated changes!",fr_FR:"N'oubliez pas d'appliquer les changements depuis la branche master",es_AR:"¡No te olvides de avanzar master a los cambios actualizados!",es_ES:"¡No te olvides de avanzar master a los cambios actualizados!",pt_BR:"Não se esqueça de avançar a referência do master para as mudanças efetuadas!",gl:"¡Non te esquezas de avanzar master ós cambios actualizados!",de_DE:"Vergiss nicht den master auf die aktuelle Version vorzuspulen",ja:"masterのポインタを先に進めることを忘れずに！",ko:"master를 변경 완료한 커밋으로 이동(forward)시키는 것을 잊지 마세요!",zh_CN:"别忘记了将 master 快进到最新的更新上！",zh_TW:"別忘記了將 master 推到最新的 commit 上面！",ru_RU:"Не забудь переместить master на последние изменения.",uk:"Не забудь перемістити master на останні зміни!",vi:"Đừng quên đẩy nhánh master lên cập nhật mới nhất!"},startDialog:{en_US:{childViews:[{type:"ModalAlert",options:{markdowns:["## Juggling Commits #2","","*If you haven't completed Juggling Commits #1 (the previous level), please do so before continuing*","","As you saw in the last level, we used `rebase -i` to reorder the commits. Once the commit we wanted to change was on top, we could easily --amend it and re-order back to our preferred order.","","The only issue here is that there is a lot of reordering going on, which can introduce rebase conflicts. Let's look at another method with `git cherry-pick`"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Remember that git cherry-pick will plop down a commit from anywhere in the tree onto HEAD (as long as that commit isn't an ancestor of HEAD).","","Here's a small refresher demo:"],afterMarkdowns:["Nice! Let's move on"],command:"git cherry-pick C2",beforeCommand:"git checkout -b bugFix; git commit; git checkout master; git commit"}},{type:"ModalAlert",options:{markdowns:["So in this level, let's accomplish the same objective of amending `C2` once but avoid using `rebase -i`. I'll leave it up to you to figure it out! :D","","Remember, the exact number of apostrophe's (') on the commit are not important, only the relative differences. For example, I will give credit to a tree that matches the goal tree but has one extra apostrophe everywhere"]}}]},fr_FR:{childViews:[{type:"ModalAlert",options:{markdowns:["## Jongler avec les commits #2","","*Si vous n'avez pas fait le défi Jongler avec les commits #1 (le niveau précédent), vous devriez le faire avant de continuer*","","Comme vu dans le niveau précédent, nous utilisons `rebase -i` pour réordonner les commits. Une fois que le commit à modifier est celui à la tête, nous pouvons facilement faire un --amend et réordonner dans l'ordre voulu.","","La difficulté ici est qu'il y a beaucoup de changements, ce qui peut introduire des conflits de rebase. Essayons avec l'autre méthode `git cherry-pick`"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["N'oubliez pas que git cherry-pick va prendre un commit de n'importe où dans l'arbre de git et le mettre devant HEAD (sauf s'il est un ancêtre de HEAD).","","Un petit rappel :"],afterMarkdowns:["Bien ! continuons."],command:"git cherry-pick C2",beforeCommand:"git checkout -b bugFix; git commit; git checkout master; git commit"}},{type:"ModalAlert",options:{markdowns:["Dans ce niveau, nous voulons modifier `C2` sans utiliser `rebase -i`. À vous maintenant de trouver comment ! :D","","Petit rappel, le nombre exact d'apostrophes (') sur le commit n'est pas important. Par exemple, nous donnerons les points à une structure qui colle au résultat mais qui a une apostrophe en trop partout."]}}]},es_AR:{childViews:[{type:"ModalAlert",options:{markdowns:["## Haciendo malabares con los commits #2","","*Si no completaste Haciendo malabares con los commits #1 (el nivel anterior), hacelo antes de continuar*","","Como viste en el último nivel, usamos `rebase -i` para reordenar los commits. Una vez que el commit que queríamos cambiar estaba arriba de todo, pudimos `--amend`earlo fácilmente y reordenarlo a como queríamos.","","El único problema con esto es que hay mucho reordenamiento, que puede generar conflictos al rebasear. Veamos otro método usando `git cherry-pick`"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Acordate de que git cherry-pick va a traer un commit de cualquier parte del árbol sobre HEAD (siempre que ese otro commit no sea un ancestro de HEAD).","","Una pequeña demo para refrescar la idea:"],afterMarkdowns:["¡Bien! Sigamos..."],command:"git cherry-pick C2",beforeCommand:"git checkout -b bugFix; git commit; git checkout master; git commit"}},{type:"ModalAlert",options:{markdowns:["Entonces, en este nivel vamos a lograr el mismo objetivo de corregir `C2`, pero sin usar `rebase -i`. Te dejo a vos el darte cuenta cómo :D","","Acordate, la cantidad exacta de apóstrofes (') en el commit no es importante, sólo la diferencia relativa. Por ejemplo, le voy a dar puntaje a un árbol que matchee el objetivo pero cuyos commits tengan todos un apóstrofe extra"]}}]},es_ES:{childViews:[{type:"ModalAlert",options:{markdowns:["## Haciendo malabares con los commits #2","","*Si no completaste Haciendo malabares con los commits #1 (el nivel anterior), hazlo antes de continuar*","","Como viste en el último nivel, usamos `rebase -i` para reordenar los commits. Una vez que el commit que queríamos cambiar se encontraba arriba de todo, pudimos `--amend`earlo fácilmente y reordenarlo a como queríamos.","","El único problema con esto es que hay mucho reordenamiento, que puede generar conflictos al rebasear. Veamos otro método usando `git cherry-pick`"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Recuerda que git cherry-pick va a traer un commit de cualquier parte del árbol sobre HEAD (siempre que ese otro commit no sea un ancestro de HEAD).","","Una pequeña demo para refrescar la idea:"],afterMarkdowns:["¡Bien! Sigamos..."],command:"git cherry-pick C2",beforeCommand:"git checkout -b bugFix; git commit; git checkout master; git commit"}},{type:"ModalAlert",options:{markdowns:["Entonces, en este nivel vamos a lograr el mismo objetivo de corregir `C2`, pero sin usar `rebase -i`. Te dejo a ti el darte cuenta cómo :D","","Recuerda, la cantidad exacta de apóstrofes (') en el commit no es importante, sólo la diferencia relativa. Por ejemplo, le voy a dar una puntuación a un árbol que coincida con el objetivo pero cuyos commits tengan todos un apóstrofe extra"]}}]},pt_BR:{childViews:[{type:"ModalAlert",options:{markdowns:["## Malabarismo com commits #2","","*Caso você não tenha completado o nível anterior (Malabarismo com commits #1), por favor faça-o antes de continuar*","","Como você viu no nível anterior, usamos `rebase -i` para reordenar os commits. Uma vez que o commit que queríamos mudar estava no topo, pudemos facilmente usar o `--amend` e depois reordená-lo de volta para obter nossa ordem preferida.","","O único problema aqui é que há muita reordenação ocorrendo, o que pode introduzir conflitos de rebase. Vamos dar uma olhada em outro método, usando o `git cherry-pick`"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Lembre-se que o git cherry-pick copiará um commit de qualquer lugar na árvore sob o HEAD (desde que esse commit não seja um ancestral do HEAD).","","Aqui está uma demonstração para refrescar sua memória:"],afterMarkdowns:["Ótimo! Vamos em frente"],command:"git cherry-pick C2",beforeCommand:"git checkout -b bugFix; git commit; git checkout master; git commit"}},{type:"ModalAlert",options:{markdowns:['Então, neste nível, vamos alcançar o mesmo objetivo de fazer "amend" no `C2`, mas evitaremos usar o `rebase -i`. Agora vou deixar com você a tarefa de descobrir como fazer! :D',"","Lembre-se, o número exato de apóstrofos (') nos commits não é importante, apenas as diferenças relativas. Por exemplo, darei todos os pontos nesta tarefa se você obtiver o mesmo resultado da árvore da visualização de objetivo com um apóstrofo extra em todos os commits"]}}]},gl:{childViews:[{type:"ModalAlert",options:{markdowns:["## Argallando cos commits #2","","*No caso de non ter rematado o tema anterior (Argallando cos commits #1), por favor faino antes de continuar*.","","Como puideches ver no anterior tema, usamos `rebase -i` para reordear os commits. Unha vez que atopamos o commit que queriamos modificar, puidemos empregar sinxelamente o `--amend`, e depois reordenalo de volta para obter a nosa orde preferida.","","O único problema aquí é que hai moita reordenación ocorrendo, o que pode introducir conflitos no rebase. Imos votar unha ollada a outro método, o uso de `git cherry-pick`"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Lembra que `git cherry-pick` copiará un commit de qualquera lugar na árbore enriba do HEAD (sempre e cando non sexa ancestro do HEAD).","","Aquí está unha demostración para que refresques a memoria:"],afterMarkdowns:["¡A tope! Seguimos."],command:"git cherry-pick C2",beforeCommand:"git checkout -b bugFix; git commit; git checkout master; git commit"}},{type:"ModalAlert",options:{markdowns:['Entón, neste nivel, imos completar o mesmo obxectivo que facendo "amend" no `C2`, pero evitando facer o `rebase -i`. Agora deixámoste que lle des os miolos para sacar o exercicio! :D',"","Recorda, o número exacto de apóstrofos (') nos commits non é importante, só as diferencias relativas. Por exemplo, levarás todos os puntos desta tarefa se obtés o mesmo resultado da árbore que se mostra na visualización do exercicio con un apóstrofo extra en tódolos commits."]}}]},de_DE:{childViews:[{type:"ModalAlert",options:{markdowns:["## Jonglieren mit Commits Teil 2","",'Du solltest "Jonglieren mit Commits" (den vorherigen Level) bestanden haben, bevor du dich an diesem hier versuchst.',"","Wie du im letzten Level gesehen hast haben wir `git rebase -i` genutzt, um die Commits neu anzuordnen. Sobald der Commit, den wir ändern wollte, ganz oben war, konnten wir das auch einfach mit `git commit --amend` tun. Danach haben wir die alte Reihenfolge wiederhergestellt.","","Das einzige Problem ist hier, dass da eine Menge Umsortieren stattfindet, was zu Rebase-Konflikten führen kann. Schauen wir uns also eine Methode mit `git cherry-pick` an."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Wie du dich erinnerst macht `git cherry-pick` eine Kopie des angegebenen Commits und fügt sie an `HEAD` an (es sei denn der Commit ist ein Vorgänger von `HEAD`).","","Hier eine kleine Demo zur Erinnerung:"],afterMarkdowns:["Schick! Und weiter geht's."],command:"git cherry-pick C2",beforeCommand:"git checkout -b bugFix; git commit; git checkout master; git commit"}},{type:"ModalAlert",options:{markdowns:["In diesem Level geht es also auch um das Ziel den Commit `C2` zu modifizieren, aber ohne `git rebase -i` zu benutzen. Ich überlass es dir herauszufinden, wie das gehen soll. :D","","Nicht vergessen, die genaue Anzahl von Kopien (d.h. Apostrophen) ist nicht ausschlaggebend, nur die Differenz. Der Level ist zum Beispiel auch gelöst, wenn dein fertiger Baum dieselbe Struktur wie der Ziel-Baum hat, aber *überall* ein Apostroph mehr aufweist."]}}]},ja:{childViews:[{type:"ModalAlert",options:{markdowns:["## コミットをやりくりする その2","","*注：この一つ前のレベル「コミットをやりくりする」をクリアしていない人は、まずそちらの問題をクリアしてきてください！*","","前回見てきたように、コミット順序の変更のために、私たちは`rebase -i`コマンドを利用しました。ツリーの先頭に変更対象のコミットがあれば、--amendオプションを使うことで容易に変更を書きかえて、元の順序に戻すことができます。","","この場合に心配なことが一つだけあって、それは複数回の順序の変更が行われるので、rebaseのコンフリクト（衝突）が起こりうることです。こういうケースへの対策として、`git cherry-pick`を使った別の解決法について考えてみましょう。"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["git cherry-pickを使うと、ツリーの中から複数のコミットを選んで、HEADの下に新しく作ることができましたね。","","簡単なデモを見てみましょう："],afterMarkdowns:["できました！次へ進みましょう"],command:"git cherry-pick C2",beforeCommand:"git checkout -b bugFix; git commit; git checkout master; git commit"}},{type:"ModalAlert",options:{markdowns:["このレベルでは、`C2`をamendすることで前回と同じ目的を達成しましょう。但し`rebase -i`は使わずにクリアしてください。どんな方法で進めるかはあなたにおまかせします！:D"]}}]},zh_CN:{childViews:[{type:"ModalAlert",options:{markdowns:["## 提交的技巧 #2","","*如果你还没有完成“提交的技巧 #1”（前一关）的话，请先通过以后再来！*","","正如你在上一关所见到的，我们可以使用 `rebase -i` 对提交记录进行重新排序。只要把我们想要的提交记录挪到最前端，我们就可以很轻松的用 `--amend` 修改它，然后把它们重新排成我们想要的顺序。","","但这样做就唯一的问题就是要进行两次排序，而这有可能造成由 rebase 而导致的冲突。下面还是看看 `git cherry-pick` 是怎么做的吧。"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["要在心里牢记 cherry-pick 可以将提交树上任何地方的提交记录取过来追加到 HEAD 上（只要不是 HEAD 上游的提交就没问题）。","","来看看这个例子："],command:"git cherry-pick C2",afterMarkdowns:["看到了吧？我们继续"],beforeCommand:"git checkout -b bugFix; git commit; git checkout master; git commit"}},{type:"ModalAlert",options:{markdowns:["这一关的目标和上一关一样，通过 `--amend` 改变提交记录 `C2`，但你不能用 `rebase -i`。自己想想要怎么解决吧！ :D","","对了，提交记录上面的`'`的数量并不重要，只是引用的不同而已。也就是说如果你的最终结果在某个提交记录上多了个`'`，我也会算你通过的。"]}}]},zh_TW:{childViews:[{type:"ModalAlert",options:{markdowns:["## commit 的戲法 #2","","*假如你還沒有完成 commit 的戲法 #1（前面那一個關卡），請先完成之後再來這一關！*","","如你在上一個關卡所看到的，我們使用 `rebase -i` 來重新排列那些 commit。只要把我們想要修改的 commit 移到最前面，我們就可以很容易地重新修改它，然後再把它們重新排成我們想要的順序。","","但唯一的問題就是這樣做就要排很多次，有可能造成 rebase conflict。下面就看看用另外一種方法 `git cherry-pick` 是怎麼做的吧！"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["要記住喔！ cherry-pick 可以從 commit tree 的任何地方拿一個 commit 來放在 HEAD 上（只要那個 commit 不是 HEAD 的 parent）。","","下面是一個簡單清楚的 demo："],command:"git cherry-pick C2",afterMarkdowns:["太棒了，我們繼續吧！"],beforeCommand:"git checkout -b bugFix; git commit; git checkout master; git commit"}},{type:"ModalAlert",options:{markdowns:["在這一關和上一關一樣要去修改一個 commit 叫做`C2`，但你要避免使用 `rebase -i`。自己想想看要怎麼解決吧！"]}}]},ko:{childViews:[{type:"ModalAlert",options:{markdowns:["## 커밋 갖고 놀기 #2","","*만약 이전 레벨의 커밋 갖고 놀기 #1을 풀지 않으셨다면, 계속하기에 앞서서 꼭 풀어보세요*","","이전 레벨에서 보셨듯이 `rebase -i` 명령으로 커밋의 순서를 바꿀 수 있습니다. 정정할 커밋이 바로 직전(top)에 있으면 간단히 --amend로 수정할 수 있고, 그리고 나서 다시 원하는 순서로 되돌려 놓으면 됩니다.","","이번에 한가지 문제는 순서를 꽤 많이 바꿔야한다는 점인데요, 그러다가 리베이스중에 충돌이 날 수 있습니다. 이번에는 다른 방법인 `git cherry-pick`으로 해결해 봅시다."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["git cherry-pick으로 HEAD에다 어떤 커밋이든 떨어 뜨려 놓을 수 있다고 알려드린것 기억나세요? (단, 그 커밋이 현재 가리키고 있는 커밋이 아니어야합니다)","","간단한 데모로 다시 알려드리겠습니다:"],afterMarkdowns:["좋아요! 계속할게요"],command:"git cherry-pick C2",beforeCommand:"git checkout -b bugFix; git commit; git checkout master; git commit"}},{type:"ModalAlert",options:{markdowns:["그럼 이번 레벨에서는 아까와 마찬가지로 `C2` 커밋의 내용을 정정하되, `rebase -i`를 쓰지 말고 해보세요. ^.~"]}}]},ru_RU:{childViews:[{type:"ModalAlert",options:{markdowns:["## Жонглируем коммитами №2","","*Перед прохождением этого уровня обязательно надо пройти предыдущий уровень – 'Жонглируем коммитами №1'*","","В прошлом уровне мы использовали `rebase -i`, чтобы переставлять коммиты. Как только нужный нам коммит оказывался в конце, мы могли спокойно изменить его при помощи `--amend` и переставить обратно.","","Единственная проблема тут - это множество перестановок, которые могут спровоцировать конфликты. Посмотрим, как с этой же задачей справится cherry-pick."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Важно помнить, что cherry-pick поместит любой коммит сразу после HEAD (только если этот коммит не является предком HEAD)","","Вот небольшое демо для напоминания:"],afterMarkdowns:["Ок! Едем дальше!"],command:"git cherry-pick C2",beforeCommand:"git checkout -b bugFix; git commit; git checkout master; git commit"}},{type:"ModalAlert",options:{markdowns:["Итак, в этом уровне нужно достичь того же эффекта, но без использования `rebase -i`. Остальное – по усмотрению.","","Важно, чтобы совпадало не только дерево коммитов, но и количество апострофов."]}}]},uk:{childViews:[{type:"ModalAlert",options:{markdowns:["## Жонглюємо комітами #2","","*Якщо ти ще не пройшов Жонглюємо комітами #1 (попередній рівень), будь ласка, зроби це перед тим як продовжити*","","Як ти бачив в попередньому рівні, ми використали `rebase -i` щоб впорядкувати набір комітів. Як тільки потрібний коміт опиняється вгорі, його досить легко змінити за допомогою --amend й потім відсортувати коміти в попередньому порядку.","","Єдина проблема з таким підходом полягає в тому, що виконується досить багато перестановок комітів, що може призвести до конфліктів при виконанні rebase. Спробуймо інший підхід який використовує `git cherry-pick`"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Не забувай, що git cherry-pick вставить коміт з будь-якого місця в HEAD (якщо це не коміт-предок HEAD).","","Ось невелике демо, щоб пригадати:"],afterMarkdowns:["Добре! Продовжуємо"],command:"git cherry-pick C2",beforeCommand:"git checkout -b bugFix; git commit; git checkout master; git commit"}},{type:"ModalAlert",options:{markdowns:["Отже, в цьому рівні досягнімо тієї ж мети -- модифікації `C2` -- але без використання `rebase -i`. Я думаю, ти розберешся як це зробити! :D","","Зверни увагу, що точне число апострофів (') в коміті не важливе, важлива тільки відносна різниця. Наприклад, якщо кожен коміт буде містити додатковий апостроф, я все одно зарахую такий розв’язок."]}}]},vi:{childViews:[{type:"ModalAlert",options:{markdowns:["## Tung hứng Commit #2","","*Nếu bạn vẫn chưa hoàn thành Tung hứng Commit #1 (cấp độ trước), hãy làm nó trước khi tiếp tục*","","Như bạn đã thấy ở cấp độ trước, ta dùng `rebase -i` để sắp xếp lại các commit. Một khi commit mà ta muốn sửa đã ở trên cùng, ta có thể dễ dàng --chỉnh sửa(amend) nó và sau đó sắp xếp lại trật tự lúc trước.","","Nhưng mà vẫn tồn tại vấn đề khi mà ta sắp xếp quá nhiều, điều này có thể dẫn đến xung đột khi rebase. Thử dùng cách khác với `git cherry-pick` nào"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Hãy nhớ rằng cherry-pick sẽ thả commit ở bất cứ đâu xuống dưới HEAD (miễn là nó không phải cha ông hay tổ tiên gì của HEAD).","","Hãy xem thử minh họa nhỏ sau:"],afterMarkdowns:["Hay! Tiếp tục nào"],command:"git cherry-pick C2",beforeCommand:"git checkout -b bugFix; git commit; git checkout master; git commit"}},{type:"ModalAlert",options:{markdowns:["Vậy thì ở cấp độ này, hãy làm hoàn thành mục tiêu tương tự là chỉnh sửa `C2` một lần nhưng hãy tránh dùng `rebase -i`. Tự tìm cách đi nhé! :D","","Nhớ rằng, số lượng dấu nháy dơn (') trên commit không quan trọng, quan trọng là mối tương liên các tham chiếu. Nói cách khác, kể cả bất cứ commit nào của bạn có thêm một đấu(') tôi vẫn công nhận đáp án của bạn"]}}]}}}},{}],122:[function(e,t,o){o.level={goalTreeString:'{"branches":{"master":{"target":"C5","id":"master","remoteTrackingBranchID":null},"side":{"target":"C3","id":"side","remoteTrackingBranchID":null}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"},"C2":{"parents":["C1"],"id":"C2"},"C3":{"parents":["C2"],"id":"C3"},"C4":{"parents":["C1"],"id":"C4"},"C5":{"parents":["C2","C4"],"id":"C5"}},"tags":{"v1":{"target":"C2","id":"v1","type":"tag"},"v0":{"target":"C1","id":"v0","type":"tag"}},"HEAD":{"target":"C2","id":"HEAD"}}',solutionCommand:"git tag v1 side~1;git tag v0 master~2;git checkout v1",startTree:'{"branches":{"master":{"target":"C5","id":"master","remoteTrackingBranchID":null},"side":{"target":"C3","id":"side","remoteTrackingBranchID":null}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"},"C2":{"parents":["C1"],"id":"C2"},"C3":{"parents":["C2"],"id":"C3"},"C4":{"parents":["C1"],"id":"C4"},"C5":{"parents":["C2","C4"],"id":"C5"}},"tags":{},"HEAD":{"target":"master","id":"HEAD"}}',name:{en_US:"Git Tags",de_DE:"Git Tags",ja:"Gitのタグ",es_AR:"Tags en git",es_ES:"Tags en git",pt_BR:"Tags no Git",gl:"Etiquetas en git",fr_FR:"Git Tags",zh_CN:"Git Tag",zh_TW:"git tag",ru_RU:"git tag",ko:"Git 태그",uk:"Git Tags",vi:"Tag trong Git"},hint:{en_US:"you can either check out the commit directly or simply checkout the tag!",fr_FR:"Vous pouvez faire le checkout sur le commit ou sur le tag !",de_DE:"Du kannst den Checkout entweder direkt auf den Commit oder das Tag machen.",ja:"コミットを直接チェックアウトできますが、簡単にタグでチェックアウトすることも可能!",es_AR:"Podés checkoutear directamente el commit, ¡o simplemente el tag!",es_ES:"Puedes hacer checkout directamente el commit, ¡o simplemente el tag!",pt_BR:"Você pode fazer checkout diretamente no commit ou na tag correspondente!",gl:"Podes saltar directamente ó commit, ¡ou a etiqueta, que é máis doado!",zh_TW:"你可以直接 checkout 到 commit 上，或是簡單的 checkout 到 tag 上",zh_CN:"你可以直接 checkout 到 commit 上，或是简单地 checkout 到 tag 上",ru_RU:"Можно сделать checkout напрямую на коммит или же на тег",ko:"커밋을 직접 또는 태그를 이용해서 체크아웃할수 있습니다!",uk:"ти можеш або зробити checkout коміта напряму чи просто зачекаутити таг!",vi:"Bạn có thể chuyển trực tiếp sang commit hoặc đơn giản là chuyển sang tag!"},startDialog:{en_US:{childViews:[{type:"ModalAlert",options:{markdowns:["## Git Tags","","As you have learned from previous lessons, branches are easy to move around and often refer to different commits as work is completed on them. Branches are easily mutated, often temporary, and always changing.","","If that's the case, you may be wondering if there's a way to *permanently* mark historical points in your project's history. For things like major releases and big merges, is there any way to mark these commits with something more permanent than a branch?",""]}},{type:"ModalAlert",options:{markdowns:['You bet there is! Git tags support this exact use case -- they (somewhat) permanently mark certain commits as "milestones" that you can then reference like a branch.',"",'More importantly though, they never move as more commits are created. You can\'t "check out" a tag and then complete work on that tag -- tags exist as anchors in the commit tree that designate certain spots.',"","Let's see what tags look like in practice."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Let's try making a tag at `C1` which is our version 1 prototype"],afterMarkdowns:["There! Quite easy. We named the tag `v1` and referenced the commit `C1` explicitly. If you leave the commit off, git will just use whatever `HEAD` is at"],command:"git tag v1 C1",beforeCommand:"git commit"}},{type:"ModalAlert",options:{markdowns:["For this level just create the tags in the goal visualization and then check `v1` out. Notice how you go into detached `HEAD` state -- this is because you can't commit directly onto the `v1` tag.","","In the next level we'll examine a more interesting use case for tags."]}}]},fr_FR:{childViews:[{type:"ModalAlert",options:{markdowns:["## Git Tags","","Comme appris dans les niveaux précédents, les branches sont faciles à manipuler et se réfèrent aux commits qui ont été faits pour compléter le travail fait sur celles-ci. Les branches sont donc constamment en mouvement.","","Dans ce cas, vous vous demandez peut-être s'il y a un moyen d'ajouter une marque *permanente* dans l'historique de votre projet. Pour des commits comme des livraisons majeures ou d'importantes fusions, existe-t-il une façon plus stable qu'une branche de garder l'état d'une branche à un instant précis ?",""]}},{type:"ModalAlert",options:{markdowns:['Vous l\'avez deviné ! Les tags Git offrent cette fonctionnalité : les tags marquent à jamais certains commits comme "milestone" (étape clé) auxquels vous pouvez vous référer comme à des branches.',"","Encore plus important, il sont définitifs. Vous ne pouvez donc pas rajouter de commit dans un tag : les tags sont un peu comme un pointeur définitif dans l'arbre des commits.","","Voyons les tags en pratique."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Essayons de faire un tag sur C1 (qui représente la version 1 de notre prototype)"],afterMarkdowns:["Voila, facile non ? Nous nommons le tag `v1` et il pointe vers le commit `C1`. Si vous ne spécifiez pas le commit, le tag pointera là où se trouve `HEAD`."],command:"git tag v1 C1",beforeCommand:"git commit"}},{type:"ModalAlert",options:{markdowns:["Pour ce niveau, créez simplement les tags visibles dans les objectifs puis faites un checkout sur le tag `v1`. Remarquez comment vous vous retrouvez dans l'état `HEAD` détachée -- c'est parce que vous ne pouvez pas commiter sur le tag `v1`.","","Dans les niveaux suivants vous verrez un cas plus intéressant d'utilisation des tags."]}}]},zh_TW:{childViews:[{type:"ModalAlert",options:{markdowns:["## git tag","","就像你之前學到的一樣，branch 很容易被移動，而且當有新的 commit 時，又會再移動，branch 經常指向不同的 commit，branch 很容易改變。","","你可能會有疑問，有沒有什麼方法可以*永遠*有一個指向 commit 的記號，例如，表示重大的軟體釋出，或者是修正很大的 bug，有沒有其它比 branch 更好的方法，可以永遠地指向這些 commit？",""]}},{type:"ModalAlert",options:{markdowns:['你說對了！git tag 可以解決這個問題，它們可以永遠地指向某個特定的 commit，就像是表示一個"里程碑"一樣。',"",'更重要的是，當有新的 commit 時，它們也不會移動，你不可以 "checkout" 到 tag 上面 commit，tag 的存在就像是一個在 commit tree 上的表示特定訊息的一個錨。',"","讓我們來實際看一下 tag 長什麼樣子..."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["讓我們試著建立一個 tag，指向 commit `C1`，表示這是我們第一個版本。"],afterMarkdowns:["看吧！非常容易，我們命名這個 tag 叫做 `v1`，並且讓它指向 commit `C1`，如果你離開了該 commit，git 會根據 `HEAD` 所指向的位置才分辨。"],command:"git tag v1 C1",beforeCommand:"git commit"}},{type:"ModalAlert",options:{markdowns:["在這個關卡中，建立一個如視覺化目標裡面的 tag，然後 checkout 到 `v1` 上面，要注意你會進到分離 `HEAD` 的狀態，這是因為你不能夠直接在 `v1` 上面做 commit。","","在下個關卡中我們會介紹更多 tag 的應用..."]}}]},zh_CN:{childViews:[{type:"ModalAlert",options:{markdowns:["## Git Tags","","相信通过前面课程的学习你已经发现了：分支很容易被人为移动，并且当有新的提交时，它也会移动。分支很容易被改变，大部分分支还只是临时的，并且还一直在变。","","你可能会问了：有没有什么可以*永远*指向某个提交记录的标识呢，比如软件发布新的大版本，或者是修正一些重要的 Bug 或是增加了某些新特性，有没有比分支更好的可以永远指向这些提交的方法呢？",""]}},{type:"ModalAlert",options:{markdowns:["当然有了！Git 的 tag 就是干这个用的啊，它们可以（在某种程度上 —— 因为标签可以被删除后重新在另外一个位置创建同名的标签）永久地将某个特定的提交命名为里程碑，然后就可以像分支一样引用了。","","更难得的是，它们并不会随着新的提交而移动。你也不能检出到某个标签上面进行修改提交，它就像是提交树上的一个锚点，标识了某个特定的位置。","","咱们来看看标签到底是什么样。"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["咱们先建立一个标签，指向提交记录 `C1`，表示这是我们 1.0 版本。"],afterMarkdowns:["很容易吧！我们将这个标签命名为 `v1`，并且明确地让它指向提交记录 `C1`，如果你不指定提交记录，Git 会用 `HEAD` 所指向的位置。"],command:"git tag v1 C1",beforeCommand:"git commit"}},{type:"ModalAlert",options:{markdowns:["在这个关卡中，按照目标建立两个标签，然后检出到 `v1` 上面，要注意你会进到分离 `HEAD` 的状态 —— 这是因为不能直接在`v1` 上面做 commit。","","在下个关卡中我们会介绍更多关于标签的有趣的应用。"]}}]},es_AR:{childViews:[{type:"ModalAlert",options:{markdowns:["## Tags en git","","Como aprendiste en lecciones anteriores, las ramas pueden moverse fácilmente, y en general van referenciando distintos commits a medida que el trabajo se va completando en ellas. Las ramas cambian fácilmente, suelen ser temporales, y siempre cambiantes.","","Si ese es el caso, te podrías estar preguntando si hay una manera de marcar *permanentemente* puntos en la historia de tu proyecto. Para cosas como releases mayores o grandes merges, ¿hay algún modo de marcar esos commits con algo más permanente que un branch?",""]}},{type:"ModalAlert",options:{markdowns:['¡Seguro que hay! Los tags de git soportan exactamente este caso de uso -- marcan (bastante) permanentemente determinados commits como "hitos" que podés referenciar como a un branch.',"",'Aún más importante, los tags no avanzan cuando se crean nuevos commits. No podés "checkoutear" un tag y completar el trabajo en ese tag - los tags son marcas fijas en el árbol de commits que designan ciertos puntos.',"","Veamos cómo se ven los tags en práctica..."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Creemos un tag en `C1`, que es nuestro prototipo de la versión 1"],afterMarkdowns:["¡Ahí está! Bastante simple. Nombramos al tag `v1` y referenciamos explícitamente al commit `C1`. Si no especificás el commit, git va a usar al apuntado por `HEAD`"],command:"git tag v1 C1",beforeCommand:"git commit"}},{type:"ModalAlert",options:{markdowns:["Para este nivel, simplemente creá los tags en la visualización final y después checkouteá `v1`. Notá cómo entrás en el estado detached -- esto es porque no podés commitear directamente sobre el tag `v1`.","","En el próximo nivel vamos a examinar un caso de uso más interesante para los tags."]}}]},es_ES:{childViews:[{type:"ModalAlert",options:{markdowns:["## Tags en git","","Como aprendiste en lecciones anteriores, las ramas pueden moverse fácilmente, y en general van referenciando distintos commits a medida que el trabajo se va completando en ellas. Las ramas cambian fácilmente, suelen ser temporales, y siempre cambiantes.","","Si ese es el caso, te podrías estar preguntando si hay una manera de marcar *permanentemente* puntos en la historia de tu proyecto. Para cosas como releases mayores o grandes merges, ¿hay algún modo de marcar esos commits con algo más permanente que un branch?",""]}},{type:"ModalAlert",options:{markdowns:['¡Seguro que hay! Los tags de git soportan exactamente este caso de uso -- marcan (bastante) permanentemente determinados commits como "hitos" que puedes referenciar como a un branch.',"","Aún más importante, los tags no avanzan cuando se crean nuevos commits. No puedes hacer checkout a un tag y completar el trabajo en ese tag - los tags son marcas fijas en el árbol de commits que designan ciertos puntos.","","Veamos cómo se ven los tags en práctica..."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Creemos un tag en `C1`, que es nuestro prototipo de la versión 1"],afterMarkdowns:["¡Ahí está! Bastante simple. Nombramos al tag `v1` y referenciamos explícitamente al commit `C1`. Si no especificas el commit, git va a usar al apuntado por `HEAD`"],command:"git tag v1 C1",beforeCommand:"git commit"}},{type:"ModalAlert",options:{markdowns:["Para este nivel, simplemente crea los tags en la visualización final y después haz checkout con `v1`. Observa cómo entras en el estado detached -- esto es porque no puedes hacer commit directamente sobre el tag `v1`.","","En el próximo nivel vamos a examinar un caso de uso más interesante para los tags."]}}]},pt_BR:{childViews:[{type:"ModalAlert",options:{markdowns:["## Tags no Git","","Como você aprendeu nas lições anteriores, ramos são fáceis de mover e geralmente vão se referindo a diferentes commits conforme você vai trabalhando no código. Ramos são facilmente mutáveis, frequentemente temporários, e estão sempre mudando.","","Se este é o caso, você pode estar se perguntando se não existe uma forma de marcar *permanentemente* pontos históricos do projeto. Para coisas como grandes releases ou grandes merges, existe alguma forma de marcar commits com algo mais permanente que um ramo?",""]}},{type:"ModalAlert",options:{markdowns:['Você acertou a aposta, existe sim! As tags do Git foram criadas exatamente para esse caso de uso -- elas marcam de forma (relativamente) permanente certos commits como se fossem "pedras de kilometragem" ("milestones") em uma estrada, e você pode referenciá-las exatamente como faz com ramos.',"",'O mais importante, no entanto, é que elas nunca se movem sozinhas quando novos commits são criados. Você pode fazer "checkout" em uma tag e então completar trabalho nessa tag -- tags existem como âncoras na árvore de commits que estão atreladas a certos pontos.',"","Vejamos como as tags se comportam na prática."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Criemos uma tag em `C1`, que é nosso protótipo da versão 1"],afterMarkdowns:["Aqui! Bem fácil. Nós chamamos a tag de `v1` e referenciamos o commit `C1` explicitamente. Se você chamar o comando sem especificar um commit, o git vai usar seja lá qual commit para o qual o `HEAD` estiver apontando"],command:"git tag v1 C1",beforeCommand:"git commit"}},{type:"ModalAlert",options:{markdowns:['Para completar esta tarefa, simplesmente crie as tags mostradas na visualização do objetivo, e então faça checkout em `v1`. Veja que você vai para o estado "Detached HEAD" -- isso é devido ao fato de que você não pode commitar diretamente na tag `v1`.',"","No próximo nível, examinaremos mais um caso de uso interessante para as tags."]}}]},gl:{childViews:[{type:"ModalAlert",options:{markdowns:["## Etiquetas en Git","","Como aprendiches nas leccións previas, as ramas pódense mover sinxelamente, e xeralmente refírense a distintos commits según vas completando o código. As ramas mutan con facilidade, soen ser temporais, e sempre cambiantes.","","Se estamos nese caso, podes preguntarte se existe unha forma de marcar *permanentemente* puntos históricos no proxecto. Para cousas como grandes entregas ou grandes merges, ¿existe algunha forma de marcar commits con algo máis permanente que unha rama?",""]}},{type:"ModalAlert",options:{markdowns:['Acertaches seguro, ¡si que existe! As etiquetas de git foron creadas para ese propósito -- elas marcan de forma (relativamente) permanente algún commits coma se fosen "marcos das fincas" ("milestones") nun campeiro, e podes facer referencias a elas mellor que o catastro.',"",'É moi importante saber que, as etiquetas non avanzan cando se crean novos commits. Non podes facer "checkout" nun tag e completar o traballo de esa etiqueta cun commit amend ou rebasándoo -- as etiquetas existen como áncoras na árbore de commits que están pegadas a certos puntos.',"","Vexamos como se comportan as etiquetas na práctica."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Creamos un tag na rama `C1`, que é o noso prototipo da versión 1"],afterMarkdowns:["¡Ahí o tes!. Sinxelo. Nomeamos a etiqueta de `v1` e referenciamos o commit `C1` explícitamente. Se non indicas o commit, git vai empregar o commit onde está situado o `HEAD`."],command:"git tag v1 C1",beforeCommand:"git commit"}},{type:"ModalAlert",options:{markdowns:['Para completar esta tarefa, crea as etiquetas amosadas na visualización do obxectivo, e entón fai checkout en `v1`. Mira que terminas no estado "Detached HEAD" -- eso é porque non podes facer commit directamente na etiqueta `v1`.',"","No próximo nivel, examinaremos un caso de uso máis interesante para as etiquetas."]}}]},de_DE:{childViews:[{type:"ModalAlert",options:{markdowns:["## Git Tags","","Wie du aus den vorhergehenden Levels weißt sind Branches einfach durch die Gegend zu schieben und zeigen auf verschiedene Commits, während die Arbeit in ihnen fortschreitet. Ein Branch wird oft verändert, manchmal nur temporär, und ist ständig in Bewegung.","","Da das so ist fragst du dich vielleicht, ob es nicht eine Möglichkeit gibt, eine bestimmte Stelle in deiner Projekt-History *permanent* zu kennzeichnen. Kann man nicht zum Beispiel für große Releases und Meilensteine nicht einen Commit mit etwas festerem kennzeichnen, als mit einem Branch-Namen?",""]}},{type:"ModalAlert",options:{markdowns:["Aber klar! In Git gibt es genau zu diesem Zweck Tags -- sie kennzeichnen einen Commit (ziemlich) permanent als Meilenstein oder ähnliches, und man kann sie ansprechen wie Branch-Namen.","","Noch viel wichtiger, Tags verändern nicht ihre Position wenn man Commits hinzufügt. Du kannst ein Tag nicht in diesem Sinne auschecken und dann Modifikationen darauf committen. Tags sind Anker im Commit-Baum, die bestimmte Stellen anzeigen.","","Lass uns anschauen wie Tags in der Praxis funktionieren."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Lass uns ein Tag bei `C1` anlegen und damit die Version 1 unseres Prototyps markieren."],afterMarkdowns:["Peng! Ziemlich einfach. Wir haben das Tag `v1` genannt und lassen es auf `C1` zeigen. Wenn du den Commit weglässt wird das Tag für den Commit erzeugt, auf den `HEAD` zeigt."],command:"git tag v1 C1",beforeCommand:"git commit"}},{type:"ModalAlert",options:{markdowns:['Um diesen Level zu schaffen, erstelle einfach die Tags wie sie in der Zielbeschreibung stehen und mach dann einen Checkout auf `v1`. Beachte wie du dabei in den "Detached HEAD" Zustand gehst -- das liegt daran, dass du keine Commits direkt auf das `v1` Tag machen kannst.',"","Im nächsten Level schauen wir uns dann interessantere Anwendungsfälle für Tags an."]}}]},ja:{childViews:[{type:"ModalAlert",options:{markdowns:["## Gitのタグ","","私たちは、前回、ブランチが簡単に移動でき、またしばしば異なる作業の完了しているコミットを参照できることを学びました。ブランチは、簡単に変化させることができ、しばしば一時的で、いつも移動しています。","","そのような場合に、もしプロジェクトの歴史的な点に*恒久的*にマークをつける方法があったならと思うかもしれません。例えば、メジャーリリースや大きなマージを行った時などに、そのコミットにブランチより恒久的な印をつける方法はないのでしょうか？",""]}},{type:"ModalAlert",options:{markdowns:["それは存在します！Gitのタグは当にそのような場面で最適です。 -- ブランチのように参照でき、「マイルストーン（標識）」のような確かで（多少）永久的な印をコミットにつけます。","","重要なことは、コミットを新たに作ってもタグは動かないということです。あなたは、タグにチェックアウトしてそのタグで作業を完了させるということはできません -- タグは、コミットツリーの特定の地点を指定する錨のようなものとして機能します。","","では、実際にタグがどのように動作するかを見てみましょう。"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["私たちのバージョン1の原本となる`C1`にタグを付けてみましょう"],afterMarkdowns:["見てください！とても簡単ですね。私たちは、`v1`という名前のタグを明示的に`C1`コミットに付与しました。もし、コミットを指定しなかった場合、`HEAD`にあるものにタグがつけられることになります。"],command:"git tag v1 C1",beforeCommand:"git commit"}},{type:"ModalAlert",options:{markdowns:["このレベルは、ゴールとして提示されている図のようにタグを作り、`v1`にチェックアウトすることで完了します。そうすると、あなたは`HEAD`分離状態になることに気づくでしょう -- これは、あなたが直接`v1`タグにコミットができないことを意味しています。","","次のレベルでは、タグのより興味深い使い方について学びます。"]}}]},ru_RU:{childViews:[{type:"ModalAlert",options:{markdowns:["## Теги","","В прошлых уроках мы усвоили, что ветки просто двигать туда-сюда и они часто ссылаются на разные коммиты как на изменения данных в ветке. Ветки просто изменить, они часто временны и постоянно меняют своё состояние.","","В таком случае, где взять *постоянную* ссылку на момент в истории изменений? Для таких вещей, как релиз, большие слияния нужно нечто более постоянное, чем ветка.",""]}},{type:"ModalAlert",options:{markdowns:["Такое средство имеется. Git предоставляет нам теги, чья основная задача – ссылаться постоянно на конкретный коммит.","","Важно, что после создания они никогда не сменят своего положения, так что можно с лёгкостью сделать checkout конкретного момента в истории изменений","","Посмотрим на это на практике."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Создадим тег на `C1`, который будет нашей версией 1"],afterMarkdowns:["Готово! Всё просто. Мы назвали тег `v1` и заставили его ссылаться на `C1` явным образом. Если конкретный коммит не указан, гит пометит тегом `HEAD`"],command:"git tag v1 C1",beforeCommand:"git commit"}},{type:"ModalAlert",options:{markdowns:["Чтобы пройти этот уровень, просто создай теги так, как показано на визуализации, и потом перейди на тег `v1`. Обрати внимание, что ты перейдёшь в состояние `detached HEAD`, так как нельзя сделать коммит прямо в тег `v1`.","","В следующем уровне мы попробуем более интересные способы применения тегов."]}}]},ko:{childViews:[{type:"ModalAlert",options:{markdowns:["## Git 태그","","이전 강의에서 배웠듯이, 브랜치는 이동하기 쉽습니다. 작업의 완료, 진행에따라 이리저리 이동하면서 서로다른 커밋을 참조하게 됩니다. 브랜치는 쉽게 변하며 임시적인 것입니다 항상 바뀌고 있죠.","","이런 상황에서, 여러분은 여러분의 프로젝트의 역사(작업 이력)에서 중요한 지점들에 *영구적으로* 표시를 할 방법이 없을까 궁금할것입니다. 주요 릴리즈나 큰 브랜치 병합(merge)이 있을때가 그런 상황이겠군요. 이런 상황에 커밋들을 표시할 브랜치보다 영구적인 방법이 있을까요?",""]}},{type:"ModalAlert",options:{markdowns:['당연히 있습니다! Git 태그는 딱 이런 상황을 위해 존재합니다 -- Git 태그는 특정 커밋들을 브랜치로 참조하듯이 영구적인 "milestone(이정표)"으로 표시합니다.',"",'중요한 점은, Git 태그는 커밋들이 추가적으로 생성되어도 절대 움직이지 않는다는 것입니다. 여러분은 태그를 "체크아웃"한 후에 그 태그에서 어떤 작업을 완료할 수 없습니다 -- 태그는 커밋 트리에서 특정 지점을 표시하기위한 닻같은 역할을 합니다.',"","자 태그가 무엇을 하는지 예제를 통해 알아봅시다"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:[" 프로토타입의 첫 버전인 `C1`에 태그를 만들어 봅시다."],afterMarkdowns:["자! 아주 쉽죠. 우리는 태그의 이름을 `v1`이라고 지었고 커밋 `C1`을 지정해서 참조했습니다. 만약 커밋을 지정해주지 않으면 git은 `HEAD`가 있는지점에 태그를 붙일 것입니다."],command:"git tag v1 C1",beforeCommand:"git commit"}},{type:"ModalAlert",options:{markdowns:["이번 레벨에서는 goal에 나타난것과 같이 태그를 만들고 `v1`을 체크아웃하면 됩니다. 분리된 `HEAD` 상태로 변하는것을 확인 해 보십시오 -- 이것은 `v1` 태그에 직접 커밋을 할 수 없기 때문입니다.","","다음 레벨에서는 태그의 더 흥미로운 활용 방법을 확인해 볼 것입니다."]}}]},uk:{childViews:[{type:"ModalAlert",options:{markdowns:["## Таги в Git","","Як ти вже знаєш з попередніх уроків, гілки досить просто переносити в інші місця, і вони постійно вказують на різні коміти в процесі того? як ті в них додаються. Гілки легко модифікувати, часто тимчасово, й вони постійно змінюються.","","В такому разі, де взяти *постійне* посилання на момент в історії твого проекту? Для таких речей як релізи чи великі мерджі потрібно щось більш стале ніж гілка.",""]}},{type:"ModalAlert",options:{markdowns:['Є один спосіб! Таги в гіт якраз для цього й були створені -- вони (більш-менш) постійно вказують на певні коміти, й відмічають певні "віхи" в житті проекту, на які ти можеш потім посилатись так само як на гілки.',"",'Але, що важливіше, вони ніколи не переміщуються під час створення нових комітів. Ти не зможеш  "зачекаутити" таг а потім закомітити якісь зміни в цей таг -- таги просто відмічають корисні чи символічні місця в дереві комітів.',"","Розгляньмо це на практиці"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Спробуймо зробити новий таг на  `C1`, що є прототипом нашої першої версії (вигаданого проекту)"],afterMarkdowns:["Ось і маєш! Все досить просто. Ми назвали наш таг `v1` і він явно посилається на `C1`. Якщо пропустити коміт, git просто відмітить те, на чому знаходиться `HEAD` в данний момент"],command:"git tag v1 C1",beforeCommand:"git commit"}},{type:"ModalAlert",options:{markdowns:["Для того щоб пройти цей рівень, достатньо створити кілька тагів, як показано на візуалізації цілей, і потім зачекаутити `v1`. Зауваж, що ти потрапиш в стан `detached HEAD` -- це тому що ти не можеш напряму комітити в таг `v1`.","","В наступному рівні ми розглянемо більш цікавий приклад роботи з тагами."]}}]},vi:{childViews:[{type:"ModalAlert",options:{markdowns:["## Tag trong Git","","Qua các bài học trước, bạn đã biết được rằng rất dễ dàng để di chuyển qua lại giữa các nhánh và chúng thường tham chiếu đến các commit khác nhau trong quá trình ta làm việc trên chúng. Nhánh thường dễ biết đổi, thường chỉ là tạm thời và chúng luôn như vậy.","","Nếu như vậy thì bạn có thể sẽ thắc mắc liệu có cách nào để đánh dấu *vĩnh viễn* một thời điểm nào đó trong lịch sử làm việc không? Khi mà dự án càng ngày càng mở rộng và merge thì diễn ra liên tục, vậy thì có cách nào để đánh dấu những commit đó một cách cố định hơn nhánh không?",""]}},{type:"ModalAlert",options:{markdowns:['Tất nhiên là có chứ! Git có các tag(thẻ) để hỗ trợ vấn đề này -- chúng (bằng cách nào đó) đánh dấu vĩnh viễn một commit cụ thể nào đó như một "cột mốc" mà sau đó bạn có thể tham chiếu đến như với nhánh.',"",'Quan trọng hơn là, khi ta commit thì chúng không hề bị di chuyển. Bạn không thể "check out" một tag rồi làm việc trên đó -- tag giống như là mỏ neo để chỉ định một điểm cụ thể nào dó trên cây lịch sử.',"","Cùng xem tag thực tế là như thế nào nào."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Hãy thử tạo một thẻ ở commit `C1` chỉ định rằng đây là phiên bản thứ nhất của ta"],afterMarkdowns:["Đó! Đơn giản như đan rổ. Ta tạo ra thẻ `v1` và tham chiếu đến commit `C1`. Nếu bạn không chỉ định commit, git sẽ gắn thẻ vào commit mà `HEAD` đang trỏ tới"],command:"git tag v1 C1",beforeCommand:"git commit"}},{type:"ModalAlert",options:{markdowns:["Trong cấp độ này hãy tạo ra một thẻ tại vị trí chỉ định và chuyển sang `v1`. Để ý rằng bạn sẽ chuyến sang trạng thái tách biệt `HEAD` -- bởi vì bạn không thể tham chiếu đến thẻ `v1`.","","Sang cấp độ tới ta sẽ xem xét một vài cách hay ho để dùng thẻ."]}}]}}}},{}],123:[function(e,t,o){o.level={goalTreeString:"%7B%22branches%22%3A%7B%22master%22%3A%7B%22target%22%3A%22C7%27%22%2C%22id%22%3A%22master%22%7D%2C%22bugFix%22%3A%7B%22target%22%3A%22C3%22%2C%22id%22%3A%22bugFix%22%7D%2C%22side%22%3A%7B%22target%22%3A%22C5%22%2C%22id%22%3A%22side%22%7D%2C%22another%22%3A%7B%22target%22%3A%22C7%22%2C%22id%22%3A%22another%22%7D%7D%2C%22commits%22%3A%7B%22C0%22%3A%7B%22parents%22%3A%5B%5D%2C%22id%22%3A%22C0%22%2C%22rootCommit%22%3Atrue%7D%2C%22C1%22%3A%7B%22parents%22%3A%5B%22C0%22%5D%2C%22id%22%3A%22C1%22%7D%2C%22C2%22%3A%7B%22parents%22%3A%5B%22C1%22%5D%2C%22id%22%3A%22C2%22%7D%2C%22C3%22%3A%7B%22parents%22%3A%5B%22C2%22%5D%2C%22id%22%3A%22C3%22%7D%2C%22C4%22%3A%7B%22parents%22%3A%5B%22C1%22%5D%2C%22id%22%3A%22C4%22%7D%2C%22C5%22%3A%7B%22parents%22%3A%5B%22C4%22%5D%2C%22id%22%3A%22C5%22%7D%2C%22C6%22%3A%7B%22parents%22%3A%5B%22C1%22%5D%2C%22id%22%3A%22C6%22%7D%2C%22C7%22%3A%7B%22parents%22%3A%5B%22C6%22%5D%2C%22id%22%3A%22C7%22%7D%2C%22C3%27%22%3A%7B%22parents%22%3A%5B%22C1%22%5D%2C%22id%22%3A%22C3%27%22%7D%2C%22C4%27%22%3A%7B%22parents%22%3A%5B%22C3%27%22%5D%2C%22id%22%3A%22C4%27%22%7D%2C%22C7%27%22%3A%7B%22parents%22%3A%5B%22C4%27%22%5D%2C%22id%22%3A%22C7%27%22%7D%7D%2C%22HEAD%22%3A%7B%22target%22%3A%22master%22%2C%22id%22%3A%22HEAD%22%7D%7D",solutionCommand:"git cherry-pick C3 C4 C7",compareOnlyMasterHashAgnostic:!0,disabledMap:{"git rebase":!0},startTree:'{"branches":{"master":{"target":"C1","id":"master"},"bugFix":{"target":"C3","id":"bugFix"},"side":{"target":"C5","id":"side"},"another":{"target":"C7","id":"another"}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"},"C2":{"parents":["C1"],"id":"C2"},"C3":{"parents":["C2"],"id":"C3"},"C4":{"parents":["C1"],"id":"C4"},"C5":{"parents":["C4"],"id":"C5"},"C6":{"parents":["C1"],"id":"C6"},"C7":{"parents":["C6"],"id":"C7"}},"HEAD":{"target":"master","id":"HEAD"}}',name:{fr_FR:"Introduction à cherry-pick",en_US:"Cherry-pick Intro",de_DE:"Einführung Cherry-picking",ja:"cherry-pick入門",es_AR:"Introducción a cherry-pick",es_ES:"Introducción a cherry-pick",pt_BR:"Introdução ao cherry-pick",gl:"Introuducción a cherry-pick",zh_CN:"Git Cherry-pick",zh_TW:"介紹 cherry-pick",ru_RU:"Введение в Cherry-pick",ko:"Cherry-pick 소개",uk:"Знайомство з cherry-pick",vi:"Giới thiệu về cherry-pick"},hint:{fr_FR:"git cherry-pick suivi par les noms de commits",en_US:"git cherry-pick followed by commit names!",de_DE:"git cherry-pick gefolgt von Commit-Namen.",ja:"git cherry-pickの後にコミット名を追加",es_AR:"git cherry-pick seguido de los nombres de los commits",es_ES:"git cherry-pick seguido de los nombres de los commits",pt_BR:"git cherry-pick seguido dos nomes dos commits",gl:"git cherry-pick seguido das referencias a commits",zh_CN:"git cherry-pick 后面要跟提交的名字",zh_TW:"git cherry-pick 後面要接著 commit 的名稱",ru_RU:"git cherry-pick основывается на именах коммитов!",ko:"커밋의 이름들로 git cherry-pick 하세요!",uk:"git cherry-pick базується на іменах комітів!",vi:"git cherry-pick sau đó là tên commit!"},startDialog:{en_US:{childViews:[{type:"ModalAlert",options:{markdowns:["## Moving Work Around","","So far we've covered the basics of git -- committing, branching, and moving around in the source tree. Just these concepts are enough to leverage 90% of the power of git repositories and cover the main needs of developers.","",'That remaining 10%, however, can be quite useful during complex workflows (or when you\'ve gotten yourself into a bind). The next concept we\'re going to cover is "moving work around" -- in other words, it\'s a way for developers to say "I want this work here and that work there" in precise, eloquent, flexible ways.',"","This may seem like a lot, but it's a simple concept."]}},{type:"ModalAlert",options:{markdowns:["## Git Cherry-pick","","The first command in this series is called `git cherry-pick`. It takes on the following form:","","* `git cherry-pick <Commit1> <Commit2> <...>`","","It's a very straightforward way of saying that you would like to copy a series of commits below your current location (`HEAD`). I personally love `cherry-pick` because there is very little magic involved and it's easy to understand.","","Let's see a demo!",""]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Here's a repository where we have some work in branch `side` that we want to copy to `master`. This could be accomplished through a rebase (which we have already learned), but let's see how cherry-pick performs."],afterMarkdowns:["That's it! We wanted commits `C2` and `C4` and git plopped them down right below us. Simple as that!"],command:"git cherry-pick C2 C4",beforeCommand:"git checkout -b side; git commit; git commit; git commit; git checkout master; git commit;"}},{type:"ModalAlert",options:{markdowns:["To complete this level, simply copy some work from the three branches shown into master. You can see which commits we want by looking at the goal visualization.",""]}}]},fr_FR:{childViews:[{type:"ModalAlert",options:{markdowns:["## Déplacer votre travail","","Nous avons maintenant pratiqué les bases de git -- commits, branches, et déplacements dans l'arbre des commits. Ces seuls concepts sont suffisants pour utiliser 90% du pouvoir des dépôts git et satisfaire les principaux besoins des développeurs.","",'Les 10% restants, cependant, peuvent être assez utiles pour les systèmes assez complexes (ou quand vous vous êtes mis tout seul dans le pétrin). Le prochain concept que nous allons aborder est "le déplacement de travail" (moving work around) -- en d\'autres termes, c\'est une façon pour les développeurs de dire  "Je veux ce travail ici et cet autre là.".',"","Cela peut sembler compliqué, mais c'est un concept simple."]}},{type:"ModalAlert",options:{markdowns:["## Git Cherry-pick","","La première commande de cette série est `git cherry-pick`. Elle a le prototype suivant :","","* `git cherry-pick <Commit1> <Commit2> <...>`","","C'est une manière simple de dire qu'on voudrait copier une série de commits en-dessous de notre emplacement actuel (`HEAD`). Personnellement, j'adore `cherry-pick` parce qu'il y a un petit peu de magie dedans, et parce que c'est facile à comprendre.","","Faisons une démonstration !",""]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Ici le dépôt que nous avons contient du travail dans la branche `side`, que nous voulons copier dans `master`. Cela pourrait être fait avec un rebase (que nous avons déjà appris), mais voyons comment cherry-pick fonctionne."],afterMarkdowns:["Voilà ! Nous voulions les commits `C2` et `C4` et git les a fait apparaître juste sous nos jambes. Aussi simple que ça !"],command:"git cherry-pick C2 C4",beforeCommand:"git checkout -b side; git commit; git commit; git commit; git checkout master; git commit;"}},{type:"ModalAlert",options:{markdowns:["Pour finir ce niveau, copiez simplement le travail désigné dans la branche master. Vous pouvez voir les commits que nous souhaitons avoir en regardant dans la fenêtre d'objectif.",""]}}]},es_AR:{childViews:[{type:"ModalAlert",options:{markdowns:["## Moviendo el trabajo por ahí","","Hasta ahora cubrimos lo básico de git -- commitear, branchear, y movernos por el árbol de commits. Estos conceptos alcanzan para aprovechar el 90% del poder de los repositorios de git y cubrir las necesidades principales de los desarrolladores.","",'El 10% restante, sin embargo, puede ser bastante útil en flujos de trabajo complejos (o cuando te metiste en algún problema complicado). El próximo concepto que vamos a cubrir es el de "mover el trabajo por ahí" -- en otras palabras, una forma que tienen los desarrolladores de decir "Quiero este trabajo allá y este otro allá" de una manera precisa, elocuente y flexible.',"","Puede parecer un montón, pero es un concepto bastante simple."]}},{type:"ModalAlert",options:{markdowns:["## Git Cherry-pick","","El primer comando en esta serie se llama `git cherry-pick`. Tiene la siguiente forma:",""," `git cherry-pick <Commit1> <Commit2> <...>`","","Es una manera bastante directa de decir que querés copiar una serie de commits sobre tu ubicación actual (`HEAD`). Personalmente amo `cherry-pick` porque hay muy poca magia involucrada y es bastante simple de entender.","","¡Veamos una demo!",""]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Acá tenemos un repositorio con algo de trabajo en la rama `side` que queremos copiar a `master`. Podríamos lograrlo con un rebase (y ya aprendimos cómo), pero veamos cómo se comporta cherry-pick."],afterMarkdowns:["¡Eso es todo! Queríamos los commits `C2` y `C4` y git los aplicó justo donde estábamos. ¡Tan simple como eso!"],command:"git cherry-pick C2 C4",beforeCommand:"git checkout -b side; git commit; git commit; git commit; git checkout master; git commit;"}},{type:"ModalAlert",options:{markdowns:["Para completar este nivel, simplemente copiá algo de trabajo desde otras tres ramas a master. Podés ver qué commits queremos en la visualización del objetivo.",""]}}]},es_ES:{childViews:[{type:"ModalAlert",options:{markdowns:["## Moviendo el trabajo por ahí","","Hasta ahora cubrimos lo básico de git -- hacer commits, crear ramas, y movernos por el árbol de commits. Estos conceptos alcanzan para aprovechar el 90% del poder de los repositorios de git y cubrir las necesidades principales de los desarrolladores.","",'El 10% restante, sin embargo, puede ser bastante útil en flujos de trabajo complejos (o cuando te metiste en algún problema complicado). El próximo concepto que vamos a cubrir es el de "mover el trabajo por ahí" -- en otras palabras, una forma que tienen los desarrolladores de decir "Quiero este trabajo aquí y este otro allí" de una manera precisa, elocuente y flexible.',"","Puede parecer un montón, pero es un concepto bastante simple."]}},{type:"ModalAlert",options:{markdowns:["## Git Cherry-pick","","El primer comando en esta serie se llama `git cherry-pick`. Tiene la siguiente forma:",""," `git cherry-pick <Commit1> <Commit2> <...>`","","Es una manera bastante directa de decir que quieres copiar una serie de commits sobre tu ubicación actual (`HEAD`). Personalmente amo `cherry-pick` porque hay muy poca magia involucrada y es bastante simple de entender.","","¡Veamos una demo!",""]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["A continuación tenemos un repositorio con algo de trabajo en la rama `side` que queremos copiar a `master`. Podríamos lograrlo con un rebase (y ya aprendimos cómo), pero veamos cómo se comporta cherry-pick."],afterMarkdowns:["¡Eso es todo! Queríamos los commits `C2` y `C4` y git los aplicó justo donde estábamos. ¡Tan simple como eso!"],command:"git cherry-pick C2 C4",beforeCommand:"git checkout -b side; git commit; git commit; git commit; git checkout master; git commit;"}},{type:"ModalAlert",options:{markdowns:["Para completar este nivel, simplemente copia algo de trabajo desde otras tres ramas a master. Puedes ver qué commits queremos en la visualización del objetivo.",""]}}]},pt_BR:{childViews:[{type:"ModalAlert",options:{markdowns:["## Movendo o trabalho por aí","","Por enquanto nós abordamos o básico do Git -- commitar, criar ramos, e mover-se pela árvore. Apenas esses conceitos já são suficientes para utilizar 90% do poder dos repositórios Git, e cobrem as principais necessidades dos desenvolvedores.","",'Os 10% restantes, entretanto, podem ser extremamente úteis em fluxos de trabalho complexos (ou quando você estiver em uma enrascada). O próximo conceito que vamos abordar é "movendo trabalho por aí" -- em outras palavras, veremos as formas como o desenvolvedor pode dizer "eu quero este trabalho aqui, e aquele ali" de formas precisas, eloquentes e flexíveis.',"","Isso pode parecer muito, mas os conceitos são simples."]}},{type:"ModalAlert",options:{markdowns:["## Git Cherry-pick","","O primeiro comando desta série é o `git cherry-pick`. Ele é chamado da seguinte forma:","","* `git cherry-pick <Commit1> <Commit2> <...>`","","Trata-se de uma forma bastante direta de dizer que você gostaria de copiar uma série de commits abaixo do seu local atual (`HEAD`). Eu pessoalmente amo o  `cherry-pick` porque há muito pouca mágica envolvida e é fácil de entender o funcionamento.","","Vejamos uma demonstração!",""]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Aqui está um repositório onde temos algum trabalho no ramo `side` que desejamos copiar para o `master`. Isso poderia ser obtido por meio de um rebase (que já aprendemos), mas vamos ver como o cherry-pick se sai."],afterMarkdowns:["É isso! Queríamos os commits `C2` e `C4` e o git os inseriu logo abaixo de nós. Simples assim!"],command:"git cherry-pick C2 C4",beforeCommand:"git checkout -b side; git commit; git commit; git commit; git checkout master; git commit;"}},{type:"ModalAlert",options:{markdowns:["Para completar este nível, simplesmente copie algum trabalho dos outros três ramos para o master. Você pode ver quais commits queremos copiar na visualização do objetivo.",""]}}]},gl:{childViews:[{type:"ModalAlert",options:{markdowns:["## Movendo traballo por ahí","","Ata agora cubrimos o uso básico de git -- facer commit, crear ramas, e moverse pola árbore. Estes conceptos chegan para aproveitar o 90% do poder dos repositorios de git e cubrilas necesidades principais dos desenvolvedores.","",'O 10% restante, ademáis, poden ser extremadamente útiles nos fluxos de traballo complexos (ou cando te meteches nalgún problema complicado). O próximo concepto que imos abordar é "movendo o traballo por ahí" -- noutras verbas, unha forma que teñen os desenvolvedores de dicir "eu quero este traballo aquí, e aquel alí" de forma precisa, elocuente e flexible.',"","Eso pode ser moito, pero os conceptos son simples."]}},{type:"ModalAlert",options:{markdowns:["## Git Cherry-pick","","O primeiro comando desta serie é `git cherry-pick`. O comando emprégase da seguinte forma:","","* `git cherry-pick <Commit1> <Commit2> <...>`","","Trátase dunha forma bastante directa de dicir que queres copiar unha serie de commits sobre a túa ubicación actual (`HEAD`). Eu persoalmente adoro `cherry-pick` porque hai moita maxia envolta e é  un funcionamento sinxelo de entender.","","Vexamos unha demostración!",""]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Aquí está un repositorio onde hai algún traballo na rama `side` que desexamos copiar para a rama `master`. Iso podería ser obtido por medio dun rebase (que xa aprendemos), pero imos ver como o resolve cherry-pick."],afterMarkdowns:["¡Eso é! Queríamos os commits `C2` e `C4` e git insertounos por baixo de nós. ¡Moi sinxelo!"],command:"git cherry-pick C2 C4",beforeCommand:"git checkout -b side; git commit; git commit; git commit; git checkout master; git commit;"}},{type:"ModalAlert",options:{markdowns:["Para completar este nivel, copia algo de traballo das outras ramas na master. Podes ver qué commits queremos copiar na visualización do obxectivo.",""]}}]},zh_TW:{childViews:[{type:"ModalAlert",options:{markdowns:["移動 commit","","目前為止我們已經講了 git 的基礎，這些基礎包括 commit、branch 以及在 commit tree 中移動，只要有這些概念你就能發揮 git 90% 的功力，而且對於程式設計師來說，這樣就很夠了。","",'而剩下的 10%，在很複雜的專案上面，是非常有用的（或者當你陷入困惑時），我們下一個要講的概念是 "移動 commit"，換句話說，當你會這個非常有彈性的招數之後，你就可以說"我想要把這個 commit 放這裡，而那個 commit 放在那裡"。',"","這看起來很複雜，但其實它很簡單。"]}},{type:"ModalAlert",options:{markdowns:["## git cherry-pick","","我們要講的第一個指令叫作 `git cherry-pick`，它的用法如下：","","* `git cherry-pick <Commit1> <Commit2> <...>`","","當你想要複製幾個 commit 並且接在你目前的位置（`HEAD`）下面的時候，這會是一個非常直接的方式。我個人非常喜歡用 `cherry-pick`，因為它並不複雜，很容易就可以了解。","","讓我們來看一個例子！",""]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["這裡有一個 repo，在 `side` branch 中，我們有一些 commit 想要複製到 `master` branch 上，這可以透過一個 rebase 來完成（我們之前已經學到了），但是讓我們看看 `git cherry-pick` 怎麼做。"],afterMarkdowns:["就是那樣！我們複製了 `C2` 以及 `C4` 並且把它們放到我們的後面，很簡單吧！"],command:"git cherry-pick C2 C4",beforeCommand:"git checkout -b side; git commit; git commit; git commit; git checkout master; git commit;"}},{type:"ModalAlert",options:{markdowns:["要完成這個關卡，只需要從三個 branch 複製幾個 commit 到 `master` 下面，你可以從視覺化的目標看到我們需要哪些 commit。",""]}}]},zh_CN:{childViews:[{type:"ModalAlert",options:{markdowns:["## 整理提交记录","","到现在我们已经学习了 Git 的基础知识 —— 提交、分支以及在提交树上移动。 这些概念涵盖了 Git 90% 的功能，同样也足够满足开发者的日常需求 ","","然而, 剩余的 10% 在处理复杂的工作流时(或者当你陷入困惑时）可能就显得尤为重要了。接下来要讨论的这个话题是“整理提交记录” —— 开发人员有时会说“我想要把这个提交放到这里, 那个提交放到刚才那个提交的后面”, 而接下来就讲的就是它的实现方式，非常清晰、灵活，还很生动。","","看起来挺复杂, 其实是个很简单的概念。"]}},{type:"ModalAlert",options:{markdowns:["## Git Cherry-pick","","本系列的第一个命令是 `git cherry-pick`, 命令形式为: ","","* `git cherry-pick <提交号>...`","","如果你想将一些提交复制到当前所在的位置（`HEAD`）下面的话， Cherry-pick 是最直接的方式了。我个人非常喜欢 `cherry-pick`，因为它特别简单。","","咱们还是通过例子来看一下！"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["这里有一个仓库, 我们想将 `side` 分支上的工作复制到 `master` 分支，你立刻想到了之前学过的 `rebase` 了吧？但是咱们还是看看 `cherry-pick` 有什么本领吧。"],afterMarkdowns:["这就是了！我们只需要提交记录 `C2` 和 `C4`，所以 Git 就将被它们抓过来放到当前分支下了。 就是这么简单!"],command:"git cherry-pick C2 C4",beforeCommand:"git checkout -b side; git commit; git commit; git commit; git checkout master; git commit;"}},{type:"ModalAlert",options:{markdowns:["要通过此关, 只需要简单的将三个分支中的提交记录复制到 master 上就可以了。目标窗口展示了我们想要哪些提交记录，如果你不小心关掉了的话，通过 `show goal` 命令可以打开，左上角也有“显示目标按钮”",""]}}]},de_DE:{childViews:[{type:"ModalAlert",options:{markdowns:["## Inhalte verschieben","","Bis jetzt haben wir uns die Grundlagen von Git angeschaut -- comitten, verzweigen und sich im Commit-Baum bewegen. Nur damit lässt sich schon 90% der Macht von Git-Repositories nutzen und die meisten Anforderungen von Entwicklern erfüllen.","",'Die übrigen 10% jedoch können in komplexeren Abläufen sehr hilfreich sein (oder wenn man sich in eine schwierige Lage manövriert hat). Das nächste was wir uns anschauen, ist, Inhalte durch den Commit-Baum zu schieben. Es gibt dem Entwickler die Möglichkeit in präziser, eloquenter Manier zu sagen "Ich will diese Inhalte hier und diese dort haben".',"","Das klingt vielleicht nach einer Menge, aber es ist sehr einfach."]}},{type:"ModalAlert",options:{markdowns:["## git cherry-pick","","Der erste Befehl in dieser Serie ist `git cherry-pick`. Er sieht so aus:","","* `git cherry-pick <Commit1> <Commit2> <...>`","","Er ist eine einfache Möglichkeit um auszudrücken, dass du eine Folge von Commits unter deinen aktuellen Checkout (also `HEAD`) hängen möchtest. Ich persönlich liebe `cherry-pick`, weil es wenig Magic enthält und einfach zu verstehen ist.","","Schauen wir's uns mal an.",""]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Hier haben wir ein Repository mit einigem Zeugs im Branch `side`, das wir in den Branch `master` kopieren wollen. Das könnten wir mit einem Rebase machen (wie bereits gesehen), aber schauen wir mal wie das mit `cherry-pick` geht."],afterMarkdowns:["Das war's! Wir wollten die commits `C2` und `C4` und Git hat die einfach unter unseren aktuellen Checkout kopiert. So einfach ist das."],command:"git cherry-pick C2 C4",beforeCommand:"git checkout -b side; git commit; git commit; git commit; git checkout master; git commit;"}},{type:"ModalAlert",options:{markdowns:["Um diesen Level zu schaffen musst du einfach nur einige Commits aus den drei gezeigten Branches in den `master` kopieren. Der Zielbaum zeigt dir, welche.",""]}}]},ja:{childViews:[{type:"ModalAlert",options:{markdowns:["## コードの移動","","今まででは、gitの基本をひたすら見てきました -- コミットしたりブランチを派生したり、そしてソースツリーの中の色々な場所に移動することなどです。これらの概念だけで、gitリポジトリの力を90%使いこなすことができ、開発者の主な需要を満たしています。","","しかし最後の10%はより複雑なワークフローやちょっとトラブった時にとても役にたちます。これから取り上げる次の課題は「作業内容の移動」 –- 詳しく言えば、「この作業はここに置き、その作業はそこに置きたい」と言う開発者のために、優しく具体的で正確にその方法をお教えしましょう。","","ちょっと複雑に聞こえるかもしれませんが、概念は簡単です。"]}},{type:"ModalAlert",options:{markdowns:["## Git Cherry-pick","","このシリーズの一つ目のコマンドは、`git cherry-pick`。このコマンドの使い方は、次の形になります:","","* `git cherry-pick <Commit1> <Commit2> <...>`","","現在の位置(`HEAD`)の下に一連のコミットをコピーしたいという意を単純に表す方法です。分かりにくいところが少ないので、個人的に私がとても好きなコマンドです。","","デモを見ていきましょう!",""]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["このリポジトリには、現在`side`ブランチから`master`にコピーしたいコードがあります。この前に学んだrebaseコマンドでも実現可能ですが、ここではcherry-pickの動作を見ていきましょう。"],afterMarkdowns:["これだけで終わりです！コミット`C2` と `C4`を取得したかったわけですが、gitが現在の位置の直下に落としてくれました。単純ですね！"],command:"git cherry-pick C2 C4",beforeCommand:"git checkout -b side; git commit; git commit; git commit; git checkout master; git commit;"}},{type:"ModalAlert",options:{markdowns:["このレベルをクリアするには、３つのブランチからmasterにコードをコピーしてください。どのコミットを取得するかについてはゴールのツリーをみてください。",""]}}]},ru_RU:{childViews:[{type:"ModalAlert",options:{markdowns:["## Поперемещаем изменения","","Итак, мы уже освоили основы Git: коммиты, ветки, перемещение по дереву изменений. Уже этих знаний достаточно, чтобы овладеть 90% мощью Git-репозиториев и покрыть нужды разработчиков.","",'А оставшиеся 10% будут очень полезны при сложных workflow (или если ты попал в сложную ситуацию). Теперь речь пойдёт о перемещении изменений — возможности, позволяющей разработчику сказать "Хочу, чтобы эти изменения были вот тут, а вот эти — вон там" и получить точные, правильные результаты, не теряя при этом гибкости разработки.',"","На первый взгляд запутанно, но на самом деле всё просто."]}},{type:"ModalAlert",options:{markdowns:["## Git Cherry-pick","","Первая из таких команд - это `git cherry-pick`. Она выглядит вот так:","","* `git cherry-pick <Commit1> <Commit2> <...>`","","Это очень простой и прямолинейный способ сказать, что ты хочешь копировать несколько коммитов на место, где сейчас находишься (`HEAD`). Мы обожаем `cherry-pick` за то, что в нём очень мало магии и его очень просто понять и применять.","","Посмотрим на демонстрацию.",""]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Вот репозиторий, где есть некие изменения в ветке `side`, которые мы хотим применить и в ветку `master`. Мы можем сделать это при помощи команды rebase, которую мы уже прошли, но давай посмотрим, как cherry-pick справится с этой задачей."],afterMarkdowns:["Вуаля! Мы хотели перенести коммиты `C2` и `C4`, Git дал нам их там, где они нужны. Всё просто!"],command:"git cherry-pick C2 C4",beforeCommand:"git checkout -b side; git commit; git commit; git commit; git checkout master; git commit;"}},{type:"ModalAlert",options:{markdowns:["Чтобы пройти этот уровень, просто скопируй изменения из этих трёх веток в мастер. Чтобы понять, какие коммиты копировать, посмотри на визуализацию уровня.",""]}}]},ko:{childViews:[{type:"ModalAlert",options:{markdowns:["## 작업을 여기저기로 옮기기","","지금까지 우리는 git의 기초를 배웠습니다. -- 커밋을하고, 브랜치를 만들고, 소스 트리 여기저기를 돌아다녔습니다. 이런 개념들을 아는 것만으로도 git repository의 힘을 90%이상 사용하고 개발자들이 필요로하는 작업의 대부분을 할 수 있습니다.","",'그 나머지 10% 기능이, 복잡한 작업(또는 작업중 막혔을때)중에 꽤 유용할 수 있습니다. 이제 배워 볼 다음 개념은 "작업을 여기저로 올기기" 다시 말해, 개발자들의 언어로 "이 일은 여기에 저 일은 저기에 두고 싶어" 정확하고 우아하고 유연하게.',"","다소 과해 보일 수 있는데, 간단한 개념입니다."]}},{type:"ModalAlert",options:{markdowns:["## Git 체리-픽 (Cherry-pick)","","이 시리즈의 첫 명령어는 `git cherry-pick` 입니다. 다음 과 같은 형태로 사용합니다:","","* `git cherry-pick <Commit1> <Commit2> <...>`","","현재 위치(`HEAD`) 아래에 있는 일련의 커밋들에대한 복사본을 만들겠다는 것을 간단히 줄인 말입니다. 개인적으로 저는 `cherry-pick`을 아주 좋아합니다 왜냐하면 조금의 마법이 첨가되있고 이해하기 쉽기 때문입니다.","","데모를 확인해봅시다",""]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["여기 repository가 있습니다. `master`와 master로 복사하고 싶은 작업이 있는 브랜치 `side`가 있습니다. 이것은 rebase를 통해서 할 수 있습니다(이미 배운), 하지만 체리-픽이 이 작업을 어떻게 수행하는지 확인해 봅시다."],afterMarkdowns:["됬습니다! 우리는 `C2`와 `C4` 커밋을 원했고 git이 우리가 원하는 곳 바로 밑에 톡 떨어뜨려 줬습니다. 아주 간단하죠!"],command:"git cherry-pick C2 C4",beforeCommand:"git checkout -b side; git commit; git commit; git commit; git checkout master; git commit;"}},{type:"ModalAlert",options:{markdowns:["이 레벨을 통과하기 위해서는 몇개의 작업을 세개의 브랜치들에서 master로 복사해와야합니다. 어떤 커밋들이 필요한지는 goal을 보고 확인하면 됩니다.",""]}}]},uk:{childViews:[{type:"ModalAlert",options:{markdowns:["## Переміщуємо зміни","","Поки що ми розглядали основи git -- як працювати з комітами та гілками й переміщення по дереву комітів. Цього вже достатньо щоб використовувати 90% фунцкій гіт та мати змогу ефективно працювати з гіт як розробник.","",'Решта 10%, тим не менш, можуть бути надзвичайно корисними при роботі зі складними робочими процесами (workflow), чи коли ти чи ще хтось щось зробили не так і ти хочеш це виправити. Наступна концепція з якою ми познайомимось це "перенесення змін" -- іншими словами, це можливість розробника переміщувати коміти між гілками в простий та зручний спосіб.',"","Це може видаватися складним, але насправді це дуже проста концепція."]}},{type:"ModalAlert",options:{markdowns:["## Git Cherry-pick","","Перша команда в цій серії називається `git cherry-pick`. Вона має наступну форму:","","* `git cherry-pick <Коміт1> <Коміт2> <...>`","","Це надзвичайно простий спосіб вказати гіту що потрібно скопіювати серію комітів до поточного розташування (`HEAD`). Персонально я обожнюю `cherry-pick` за його прямолінійнсть, це дуже зрозуміла концепція що не використовує прихованої магії","","Давайте подивимось на практиці!",""]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Ми бачимо репозиторій де є певні зміни в гілці `side` які ми хочемо скопіювати в  `master`. Для цього можна використати rebase (який ми вже вивчили), але подивимось як з цим впорається cherry-pick."],afterMarkdowns:["Овва! Ми хотіли коміти `C2` та `C4` і git додав їх до поточного розташування. Просто й доступно!"],command:"git cherry-pick C2 C4",beforeCommand:"git checkout -b side; git commit; git commit; git commit; git checkout master; git commit;"}},{type:"ModalAlert",options:{markdowns:["Щоб пройти це рівень, просто скопіюй якісь зміни з трьох гілок показаних на діаграмі в master. В візуалізації видно які коміти потрібно скопіювати.",""]}}]},vi:{childViews:[{type:"ModalAlert",options:{markdowns:["## Mang đi kéo về","","Cho đến giờ thì ta đã nắm được cơ bản về git -- commit, rẽ nhánh, và dịch chuyển qua lại trên cây mã nguồn. Chừng ấy khái niệm là đã đủ để tác động đến 90% sức mạnh của kho chứa git và các chức nawmg cần thiết cho nhà phát triển phần mềm.","",'Tuy nhiên 10% còn lại thì lại khá hữu ích trong các quy trình làm việc phức tạp (hoặc khi bạn vướng phải tình huống khó khăn). The next concept we\'re going to cover is "chỉnh lý các bản ghi" -- đó là cách để nhà phát triển nói rằng"Tôi muốn lấy bản ghi ở đây và cả bản ghi ở đó" một cách chính xác, linh hoạt và sống động.',"","Nghe thì có vẻ phức tạp, nhưng thực ra khái niệm này khá đơn giản."]}},{type:"ModalAlert",options:{markdowns:["## Git Cherry-pick","","Lệnh đầu tiên của loạt bài này là `git cherry-pick`, dạng lệnh là::","","* `git cherry-pick <Commit1> <Commit2> <...>`","","Đó là cách rất trực tiếp để copy một loạt commit xuống dưới vị trí hiện tại của bạn (`HEAD`). Cá nhân tôi thì rất thích `cherry-pick` bởi tính tiện dụng và dễ hiểu của nó.","","Hãy xem qua một ví dụ!",""]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Ở đây ta có một kho chứa mà ta muốn sao chép thành quả công việc từ nhánh `side` sang nhánh `master`. Có thể dùng rebase để làm việc này (kỹ thuật mà ta đã học), nhưng hãy xem thử cherry-pick làm điều này ra sao."],afterMarkdowns:["Thế thôi! Chúng ta chỉ cần các commit `C2` và` C4`, vì vậy Git sẽ lấy chúng và đặt chúng dưới nhánh hiện tại. Thật đơn giản!"],command:"git cherry-pick C2 C4",beforeCommand:"git checkout -b side; git commit; git commit; git commit; git checkout master; git commit;"}},{type:"ModalAlert",options:{markdowns:["Để hoàn thành cấp độ này, hãy copy thành quả công việc từ 3 nhánh khác vào master. Bạn có thể nhìn vào mô tả mục tiêu để biết chúng ta cần những commit nào.",""]}}]}}}},{}],124:[function(e,t,o){o.level={goalTreeString:'{"branches":{"master":{"target":"C2","id":"master"},"bugFix":{"target":"C4","id":"bugFix"}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"},"C2":{"parents":["C1"],"id":"C2"},"C3":{"parents":["C1"],"id":"C3"},"C4":{"parents":["C3"],"id":"C4"}},"HEAD":{"target":"C4","id":"HEAD"}}',solutionCommand:"git checkout C4",startTree:'{"branches":{"master":{"target":"C2","id":"master"},"bugFix":{"target":"C4","id":"bugFix"}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"},"C2":{"parents":["C1"],"id":"C2"},"C3":{"parents":["C1"],"id":"C3"},"C4":{"parents":["C3"],"id":"C4"}},"HEAD":{"target":"bugFix","id":"HEAD"}}',name:{en_US:"Detach yo' HEAD",es_AR:"Desatacheá tu HEAD",es_ES:"Desatachea tu HEAD",pt_BR:"Solte a sua cabeça",gl:"Abandona o teu HEAD",fr_FR:"Détacher votre HEAD",zh_CN:"分离 HEAD",zh_TW:"分離 HEAD",de_DE:"Den Kopf abtrennen",ja:"HEADの分離",ru_RU:"Теряем голову, или detached HEAD",ko:"HEAD 분리하기",uk:"Втрачаємо голову чи detached HEAD",vi:"Tháo đầu cái nào"},hint:{en_US:"Use the label (hash) on the commit for help!",es_AR:"¡Usá la etiqueta (hash) sobre el commit para ayudarte!",es_ES:"¡Usa la etiqueta (hash) sobre el commit para ayudarte!",pt_BR:"Use o identificador (hash) sobre o commit para te ajudar!",gl:"¡Usa a etiqueta (hash) sobre o commit para axudarte!",de_DE:"Benutze den Bezeichner (den Hash) des Commits.",ja:"コミットのラベル（hash）を使用",fr_FR:"Utilisez le label (identifiant) du commit pour aider !",zh_TW:"使用 commit 上的標籤（hash）來幫助你！",zh_CN:"使用提交记录上的标签（哈希值）来指定提交记录！",ru_RU:"Ориентируйся по идентификаторам (hash) коммитов.",ko:"커밋에 있는 라벨(hash)을 활용하세요!",uk:"Орієнтуйся по індентифікаторам (hash) комітів.",vi:"Dùng mã băm (hash) của commit để hoàn thành!"},startDialog:{en_US:{childViews:[{type:"ModalAlert",options:{markdowns:["## Moving around in Git","","Before we get to some of the more advanced features of Git, it's important to understand different ways to move through the commit tree that represents your project.","","Once you're comfortable moving around, your powers with other git commands will be amplified!","","","","",""]}},{type:"ModalAlert",options:{markdowns:["## HEAD","","First we have to talk about \"HEAD\". HEAD is the symbolic name for the currently checked out commit -- it's essentially what commit you're working on top of.","","HEAD always points to the most recent commit which is reflected in the working tree. Most git commands which make changes to the working tree will start by changing HEAD.","","Normally HEAD points to a branch name (like bugFix). When you commit, the status of bugFix is altered and this change is visible through HEAD."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Let's see this in action. Here we will reveal HEAD before and after a commit."],afterMarkdowns:["See! HEAD was hiding underneath our `master` branch all along."],command:"git checkout C1; git checkout master; git commit; git checkout C2",beforeCommand:""}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["### Detaching HEAD","","Detaching HEAD just means attaching it to a commit instead of a branch. This is what it looks like beforehand:","","HEAD -> master -> C1",""],afterMarkdowns:["And now it's","","HEAD -> C1"],command:"git checkout C1",beforeCommand:""}},{type:"ModalAlert",options:{markdowns:["To complete this level, let's detach HEAD from `bugFix` and attach it to the commit instead.","","Specify this commit by its hash. The hash for each commit is displayed on the circle that represents the commit."]}}]},es_AR:{childViews:[{type:"ModalAlert",options:{markdowns:["## Moviéndose por ahí con Git","","Antes de meternos en algunas de las funcionalidades más avanzadas de git, es importante entender las distintas maneras de moverse por el árbol de commits que representa tu proyecto.","","Una vez que estés cómodo moviendote por ahí, tus poderes con los otros comandos de git ¡van a amplificarse!","","","","",""]}},{type:"ModalAlert",options:{markdowns:["## HEAD","",'Primero tenemos que hablar de "HEAD". HEAD es el nombre simbólico del commit actualmente checkouteado -- es, básicamente, el commit sobre el que estás trabajando.',"","HEAD siempre apunta al commit más reciente, reflejado en el árbol de commits. La mayoría de los comandos de git que hacen cambios al árbol de commits empiezan modificando HEAD.","","Normalmente HEAD apunta al nombre de una rama (como bugFix). Cuando commiteás, el estado de bugFix se altera y este cambio es visible a través de HEAD."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Veámoslo en acción. Acá vamos a ver a HEAD antes y después de un commit."],afterMarkdowns:["¡Ves! HEAD estuvo oculta bajo nuestra rama `master` todo este tiempo."],command:"git checkout C1; git checkout master; git commit; git checkout C2",beforeCommand:""}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["### Detacheando HEAD","","Detachear (_des-adjuntar_) HEAD simplemente significa adjuntarla a un commit en lugar de a un branch. Así es como se ve de antemano:","","HEAD -> master -> C1",""],afterMarkdowns:["Y así queda ahora:","","HEAD -> C1"],command:"git checkout C1",beforeCommand:""}},{type:"ModalAlert",options:{markdowns:["Para completar este nivel, detacheemos HEAD de `bugFix` y atacheemosla al commit, en cambio.","","Especificá este commit por su hash. El hash de cada commit se muestra en el círculo que lo representa."]}}]},es_ES:{childViews:[{type:"ModalAlert",options:{markdowns:["## Moviéndote por ahí con Git","","Antes de meternos en algunas de las funcionalidades más avanzadas de git, es importante entender las distintas maneras de moverse por el árbol de commits que representa tu proyecto.","","Una vez que estés cómodo moviendote por ahí, tus poderes con los otros comandos de git ¡van a amplificarse!","","","","",""]}},{type:"ModalAlert",options:{markdowns:["## HEAD","",'Primero tenemos que hablar de "HEAD". HEAD es el nombre simbólico del commit sobre el que hemos hecho checkout -- es, básicamente, el commit sobre el que estás trabajando.',"","HEAD siempre apunta al commit más reciente, reflejado en el árbol de commits. La mayoría de los comandos de git que hacen cambios al árbol de commits empiezan modificando HEAD.","","Normalmente HEAD apunta al nombre de una rama (como bugFix). Cuando creas un commit, el estado de bugFix se altera y este cambio es visible a través de HEAD."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Veámoslo en acción. A continuación vamos a ver a HEAD antes y después de un commit."],afterMarkdowns:["¡Ves! HEAD estuvo oculta bajo nuestra rama `master` todo este tiempo."],command:"git checkout C1; git checkout master; git commit; git checkout C2",beforeCommand:""}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["### Detacheando HEAD","","Detachear (_des-adjuntar_) HEAD simplemente significa adjuntarla a un commit en lugar de a un branch. Así es como se ve de antemano:","","HEAD -> master -> C1",""],afterMarkdowns:["Y así queda ahora:","","HEAD -> C1"],command:"git checkout C1",beforeCommand:""}},{type:"ModalAlert",options:{markdowns:["Para completar este nivel, detaheemos HEAD de `bugFix` y atacheemosla al commit, en cambio.","","Especifica este commit por su hash. El hash de cada commit se muestra en el círculo que lo representa."]}}]},pt_BR:{childViews:[{type:"ModalAlert",options:{markdowns:["## Movendo-se no Git","","Antes de seguirmos para algumas funcionalidades mais avançadas do Git, é importante entender as diferentes formas de se mover através da árvore de commits que representa o seu projeto.","","Uma vez que você estiver confortável em se mover ao redor, seus poderes utilizando outros comandos do Git serão amplificados!","","","","",""]}},{type:"ModalAlert",options:{markdowns:["## HEAD","",'Primeiro temos que conversar sobre a "cabeça" ("HEAD"). HEAD é um nome simbólico para o commit atualmente ativo (que sofreu checkout por último) -- é essencialmente o commit sobre o qual você está trabalhando no momento.',"","O HEAD sempre aponta para o commit mais recentemente copiado sobre a árvore de trabalho (arquivos do projeto). A maioria dos comandos do git que realizam mudanças sobre a árvore de trabalho começarão mudando o HEAD.","","Normalmente o HEAD aponta para o nome de um ramo (por exemplo, bugFix). Quando você commita, o status do bugFix é alterado e essa mudança ocorre também sobre o HEAD."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Vejamos isto em ação. Aqui vamos mostrar o HEAD antes e depois de um commit."],afterMarkdowns:["Veja! O HEAD estava se escondendo ao lado do nosso `master` esse tempo todo."],command:"git checkout C1; git checkout master; git commit; git checkout C2",beforeCommand:""}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["### Soltando a cabeça","",'Soltar o HEAD significa anexá-lo a um commit em vez de anexá-lo a um ramo. Antes do estado solto ("detached"), é assim como se parece:',"","HEAD -> master -> C1",""],afterMarkdowns:["E agora é","","HEAD -> C1"],command:"git checkout C1",beforeCommand:""}},{type:"ModalAlert",options:{markdowns:["Para completar este nível, vamos soltar o HEAD do `bugFix` e em vez disso anexá-lo ao commit.","","Especifique o commit por meio do hash correspondente. O hash de cada commit é mostrado dentro do círculo que representa o commit (a letra C seguida de um número)."]}}]},gl:{childViews:[{type:"ModalAlert",options:{markdowns:["## Movéndose en Git","","Antes de seguir con algunhas das funcionalidades máis avanzadas de Git, é importante entender as diferentes formas de se mover a través da árbore de commits que representa o teu proxecto.","","¡Unha vez que te sintas ben ó teu redor, os teus poderes empregando outros comandos de git serán amplificados!","","","","",""]}},{type:"ModalAlert",options:{markdowns:["## HEAD","",'Primeiro temos que falar sobre o "commit actual" ("HEAD"). HEAD é un nome simbólico para o commit atualmente ativo (o último checkout que se fixo) -- é esencialmente o commit sobre o cal estás traballando nese momento.',"","O HEAD sempre apunta para o commit máis recentemente copiado sobre a árbore de traballo (arquivos do proxecto). A maioría dos comandos de git que fan algún cambio sobre a árbore de traballo empezarán movendo o HEAD.","","Normalmente o HEAD apunta para o nome dunha rama (por exemplo, bugFix). Quando fagas commit, o status do bugFix é alterado e ese cambio ocorre tamén sobre o HEAD."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Vexamos isto en acción. Aquí imos mostrar o HEAD antes e depois dun commit."],afterMarkdowns:["Ves! O HEAD estivo ó lado do noso `master` todo este tempo."],command:"git checkout C1; git checkout master; git commit; git checkout C2",beforeCommand:""}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["### Soltando a cabeza","",'Soltar o HEAD significa apuntar a un commit en vez de apuntar a unha rama. Antes do estado solo ("detached"), é así como aparece:',"","HEAD -> master -> C1",""],afterMarkdowns:["E agora é","","HEAD -> C1"],command:"git checkout C1",beforeCommand:""}},{type:"ModalAlert",options:{markdowns:["Para completar este nivel, imos soltar o HEAD de `bugFix` e en vez diso apuntamos ó commit.","","Especifica o commit por medio do hash correspondente. O hash de cada commit está dentro do círculo que representa ó commit (a letra C seguida dun número)."]}}]},fr_FR:{childViews:[{type:"ModalAlert",options:{markdowns:["## Se déplacer dans Git","","Avant que nous découvrions quelques-unes des fonctionnalités les plus avancées de Git, il est important de comprendre les différents manières de se déplacer dans l'arbre des commits qui représente votre projet.","","Une fois que ces déplacements seront aisés, votre puissance avec les autres commandes de git sera amplifiée !","","","","",""]}},{type:"ModalAlert",options:{markdowns:["## HEAD","",'Premièrement nous avons parlé de "HEAD". HEAD est le nom symbolique pour le commit sur lequel nous nous situons actuellement -- plus simplement c\'est le commit sur lequel nous travaillons.',"","HEAD pointe toujours sur le commit le plus récent dans l'arbre des commits. La plupart des commandes git qui modifient l'arbre des commits vont commencer par modifier HEAD.","","Normalement HEAD pointe sur le nom d'une branche (comme bugFix). Quand vous effectuez un commit, le statut de bugFix est modifié et ce changement est visible par le biais de HEAD."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Voyons cela en action. Ici nous allons indiquer où se situe HEAD avant et après un commit."],afterMarkdowns:["Vous voyez ! HEAD était caché en dessous de la branche `master` tout le long."],command:"git checkout C1; git checkout master; git commit; git checkout C2",beforeCommand:""}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["### Détacher HEAD","","Détacher HEAD signifie simplement que l'on attache HEAD à un commit au lieu d'une branche. Voilà à quoi cela ressemble actuellement :","","HEAD -> master -> C1",""],afterMarkdowns:["Et maintenant c'est","","HEAD -> C1"],command:"git checkout C1",beforeCommand:""}},{type:"ModalAlert",options:{markdowns:["Pour terminer ce niveau, détacher HEAD de `bugFix` et attachez-le plutôt au commit.","","Spécifiez le commit par son identifiant (hash). Le hash de chaque commit est affiché dans le rond qui représente le commit."]}}]},de_DE:{childViews:[{type:"ModalAlert",options:{markdowns:["## Navigation durch Git","","Bevor wir uns einige fortgeschrittene Konzepte in Git ansehen ist es wichtig, verschiedene Wege zum Navigieren durch den Commit-Baum, der das Projekt enthält, zu kennen.","","Sobald du das drauf hast, vergrößern sich deine Möglichkeiten in allen anderen Git-Befehlen.","","","","",""]}},{type:"ModalAlert",options:{markdowns:["## HEAD","","Erst mal müssen wir über `HEAD` reden. `HEAD` ist ein Alias für den Commit, der gerade ausgecheckt ist -- es ist im Prinzip der Commit, an den du deinen nächsten Commit hängst.","","`HEAD` zeigt immer auf den neuesten Commit. Die meisten Git-Befehle, die den Baum verändern, fangen damit an dass sie `HEAD` verschieben.","","Normalerweise zeigt `HEAD` auf einen Branch-Namen (z.B. `bugFix`). Wenn du einen Commit machst, wird `bugFix` auf diesen Commit geschoben, und `HEAD` (da es auf `bugFix` zeigt) automatisch auch."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Schauen wir uns das mal in Aktion an. Wir werden hier `HEAD` vor und nach dem Commit anzeigen."],afterMarkdowns:["Siehst du? `HEAD` war die ganze Zeit unter `master` versteckt."],command:"git checkout C1; git checkout master; git commit; git checkout C2",beforeCommand:""}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["### HEAD abkoppeln","",'`HEAD` abzukoppeln bedeutet, es direkt an einen bestimmten Commit zu hängen, anstatt an einen Branch. Wir gelangen dadurch in den "detached HEAD state". So sieht\'s vorher aus:',"","`HEAD` -> `master` -> `C1`",""],afterMarkdowns:["Und jetzt:","","`HEAD` -> `C1`"],command:"git checkout C1",beforeCommand:""}},{type:"ModalAlert",options:{markdowns:["Um diesen Level abzuschließen, lass uns mal `HEAD` von `bugFix` abkoppeln und an den Commit hängen.","","Gib den Commit mit seinem Hash an. Der Hash jedes Commits steht in dem Kreis, der den Commit darstellt."]}}]},zh_CN:{childViews:[{type:"ModalAlert",options:{markdowns:["## 在提交树上移动","","在接触 Git 更高级功能之前，我们有必要先学习在你项目的提交树上前后移动的几种方法。","","一旦熟悉了如何在 Git 提交树上移动，你驾驭其它命令的能力也将水涨船高！",""]}},{type:"ModalAlert",options:{markdowns:["## HEAD","","我们首先看一下 “HEAD”。 HEAD 是一个对当前检出记录的符号引用 —— 也就是指向你正在其基础上进行工作的提交记录。","","HEAD 总是指向当前分支上最近一次提交记录。大多数修改提交树的 Git 命令都是从改变 HEAD 的指向开始的。","","HEAD 通常情况下是指向分支名的（如 bugFix）。在你提交时，改变了 bugFix 的状态，这一变化通过 HEAD 变得可见。"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["下面咱们通过实际操作看一下。我们将会观察提交前后 HEAD 的位置。"],afterMarkdowns:["看到了吗？ HEAD 指向了 `master`，随着提交向前移动。","","（译者注：实际这些命令并不是真的在查看 HEAD 指向，看下一屏就了解了。如果想看 HEAD 指向，可以通过 `cat .git/HEAD` 查看，","如果 HEAD 指向的是一个引用，还可以用 `git symbolic-ref HEAD` 查看它的指向。但是该程序不支持这两个命令）"],command:"git checkout C1; git checkout master; git commit; git checkout C2",beforeCommand:""}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["### 分离的 HEAD","","分离的 HEAD 就是让其指向了某个具体的提交记录而不是分支名。在命令执行之前的状态如下所示： ","","HEAD -> master -> C1","","HEAD 指向 master， master 指向 C1"],afterMarkdowns:["现在变成了","","HEAD -> C1"],command:"git checkout C1",beforeCommand:""}},{type:"ModalAlert",options:{markdowns:["想完成此关，从 `bugFix` 分支中分离出 HEAD 并让其指向一个提交记录。","","通过哈希值指定提交记录。每个提交记录的哈希值显示在代表提交记录的圆圈中。"]}}]},zh_TW:{childViews:[{type:"ModalAlert",options:{markdowns:["## 在 git 中前後移動","","在接觸 git 的更多進階的主題之前，我們先學習用不同的方法在你的 project 中的 commit tree 上面移動。","","一旦能夠熟練地在 commit tree 中隨意地移動，你使用其它的 git 指令也會更厲害！",""]}},{type:"ModalAlert",options:{markdowns:["## HEAD","",'我們首先看一下 "HEAD"，HEAD 是一個 reference，它是指向目前所 checkout 的 commit，基本上，其實就是你目前所在的 commit。',"","在 commit tree 中，HEAD 總是指向最近的一次commit。大部份 git 的指令如果要修改 commit tree 的狀態的話，都會先改變 HEAD 所指向的 commit。","","HEAD 通常指向一個 branch 的名稱（比如 bugFix）。當你 commit 的時候，改變了 bugFix 的狀態，這一個變化可以從 HEAD 的改變中看到。"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["在實際的例子中。我們將會觀察 commit 前後 HEAD 的位置。"],afterMarkdowns:["看吧！HEAD 一直藏在 `master` 分支的後面。"],command:"git checkout C1; git checkout master; git commit; git checkout C2",beforeCommand:""}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["### 分離 HEAD","","分離 HEAD 就是讓其指向一個 commit 而不是 branch 的名稱。這是指令執行之前的樣子：","","HEAD -> master -> C1",""],afterMarkdowns:["現在變成了","","HEAD -> C1"],command:"git checkout C1",beforeCommand:""}},{type:"ModalAlert",options:{markdowns:["想要完成這一個關卡，從 `bugFix` 分離出 HEAD 並且讓它指向一個 commit。","","通過 hash 值可以指定 commit。每個 commit 的 hash 值顯示在各自的圓圈中。"]}}]},ja:{childViews:[{type:"ModalAlert",options:{markdowns:["## 任意の位置への移動","","Gitの上級機能に進む前に、自分のプロジェクトを表すコミットツリーの中で任意の位置へ移動する様々な方法を知っておく必要があります。","","移動方法が身につけば、他のgitコマンドをよりうまく扱えるようになるでしょう！","","","","",""]}},{type:"ModalAlert",options:{markdowns:["## HEAD","",'まずは"HEAD"から始めましょう。HEADとは現在チェックアウトされているコミットを指す単語です -- ようするに今作業中のコミットを表します。',"","HEADはいつも、作業中のツリーに反映されている最新のコミットを指します。作業ツリーへ変更を加える多くのgitコマンドはまずHEADから処理を始めます。","","HEADは普段、ブランチ名（例えば、bugFixなど）を指します。コミットすれば、bugFixの状態が変更され、その変更がHEADから確認できるようになります。"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["実際の動作を見てみましょう。ここでは、コミットの前と後のHEADの状態を確認します。"],afterMarkdowns:["ほら、HEADが元から`master`ブランチの下に隠れていたんですね！"],command:"git checkout C1; git checkout master; git commit; git checkout C2",beforeCommand:""}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["### HEADの分離","","HEADの分離(detached HEAD)とは単に、ブランチではなく特定のコミットにHEADを紐づけることです。実行前の状態は次のようです:","","HEAD -> master -> C1",""],afterMarkdowns:["そして実行後はこう:","","HEAD -> C1"],command:"git checkout C1",beforeCommand:""}},{type:"ModalAlert",options:{markdowns:["このレベルをクリアするには、HEADを`bugFix`から分離し、その代わりに特定のコミットに紐づけましょう。","","このコミットをハッシュで指定します。コミットのハッシュはそのコミットを表す丸に刻まれています。"]}}]},ru_RU:{childViews:[{type:"ModalAlert",options:{markdowns:["## Прогулка по Git","","Прежде чем перейти к более продвинутым фичам Git, важно понять различные способы перемещения по дереву коммитов вашего проекта.","","Как только вы научитесь свободно передвигаться по дереву коммитов, ваши возможности в Git приумножатся.","","","","",""]}},{type:"ModalAlert",options:{markdowns:["## HEAD","",'В первую очередь, поговорим о "HEAD". HEAD - это символическое имя текущего выбранного коммита — это, по сути, тот коммит, над которым мы в данным момент работаем.',"","HEAD всегда указывает на последний коммит из вашего локального дерева. Большинство команд Git, изменяющих рабочее дерево, начнут с изменения HEAD.","","Обычно HEAD указывает на имя ветки (например, `bugFix`). Когда вы делаете коммит, статус ветки `bugFix` меняется и это изменение видно через HEAD."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Посмотрим, как это работает. Обратите внимание на то, где находится HEAD до и после коммита."],afterMarkdowns:["Вот! HEAD всё это время скрывался за веткой `master`."],command:"git checkout C1; git checkout master; git commit; git checkout C2",beforeCommand:""}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["### Detaching HEAD","","Отделение (detaching) HEAD означает лишь присвоение его не ветке, а конкретному коммиту. Посмотрим, что было до отделения:","","HEAD -> master -> C1",""],afterMarkdowns:["А вот что получилось теперь","","HEAD -> C1"],command:"git checkout C1",beforeCommand:""}},{type:"ModalAlert",options:{markdowns:["Чтобы пройти уровень, давай отделим HEAD от ветки `bugFix` и присвоим его последнему коммиту в этой же ветке.","","Укажи коммит при помощи его идентификатора (hash). Hash для каждого коммита указан в кружке на схеме."]}}]},ko:{childViews:[{type:"ModalAlert",options:{markdowns:["## Git에서 여기저기로 옮겨다니기","","Git의 고급기능들에 대해 더 알아보기 전에, 여러분의 프로젝트를 표현하는 커밋 트리(commit tree)에서 이동 할 수 있는 여러가지 방법들을 아는것이 중요합니다.","","여기저기 이동하는 것에 익숙해지면, 여러분이 다른 git 명령어들을 사용하는 능력도 아주 좋아질 것입니다!","","","","",""]}},{type:"ModalAlert",options:{markdowns:["## HEAD","",'먼저"HEAD"에 대해 이야기해 봅시다. HEAD는 현재 체크아웃된 커밋을 가리킵니다. -- 다시 말하자면 현재 작업중인 커밋입니다.',"","HEAD는 항상 작업트리의 가장 최근 커밋을 가리킵니다. 작업트리에 변화를 주는 git 명령어들은 대부분 HEAD를 변경하는것으로 시작합니다.","","일반적으로 HEAD는 브랜치의 이름을 가리키고있습니다(bugFix와 같이). 커밋을 하게 되면, bugFix의 상태가 바뀌고 이 변경은 HEAD를 통해서 확인이 가능합니다."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["직접 확인해 봅시다. 여기서 우리는 보이지 않던 HEAD를 커밋전, 후에 드러낼 것입니다."],afterMarkdowns:["보세요! HEAD가 `master`브랜치 아래에 숨어 있던 거군요."],command:"git checkout C1; git checkout master; git commit; git checkout C2",beforeCommand:""}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["### HEAD 분리하기","","HEAD를 분리한다는 것은 HEAD를 브랜치 대신 커밋에 붙이는 것을 의미합니다. 명령을 사용하기 전의 모습은 다음과 같습니다:","","HEAD -> master -> C1",""],afterMarkdowns:["이제는 이렇게 되는군요","","HEAD -> C1"],command:"git checkout C1",beforeCommand:""}},{type:"ModalAlert",options:{markdowns:["다음 레벨로 넘어가기 위해서는, HEAD를 `bugfix`에서 분리하고 그 커밋에 붙이세요.","","각 커밋은 그것의 해시값으로 특정지을수 있습니다. 각 커밋의 해시값은 각 커밋을 나타내는 원안에 나타나있습니다."]}}]},uk:{childViews:[{type:"ModalAlert",options:{markdowns:["## Прогулянка по Git","","Перед тим як ми перейдемо до складніших можливостей гіта, важливо розуміти різні способи переміщення по дереву комітів твого проекту.","","Дуже важливо щоб тобі було комфортно переміщатись по репозиторію, так як цей навик тобі знадобиться для використання в більшості команд git!","","","","",""]}},{type:"ModalAlert",options:{markdowns:["## HEAD (голова)","",'Спочатку розберемось з "HEAD". HEAD це символьне ім’я поточного вибраного коміта -- по суті це той коміт з яким ти зараз працюєш.',"","HEAD завжди вказує на найновіший коміт з робочого дерева. Більшість команд що змінюють локальне дерево комітів, також модифікують HEAD.","","Зазвичай HEAD вказує на ім’я бранча (наприклад bugFix). Коли ти комітиш, змінюється статус гілки bugFix й це можна побачити подивившись на  HEAD."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Розберемось з цим на практиці. Зараз ми перевіримо HEAD до та після коміту."],afterMarkdowns:["Ти диви! HEAD весь цей час ховався за гілкою `master`."],command:"git checkout C1; git checkout master; git commit; git checkout C2",beforeCommand:""}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["### Відокремлюємо голову","","Detached HEAD (відокремлена голова) просто означає що HEAD посилається на коміт, а не на якусь гілку. Ось як це виглядає спочатку:","","HEAD -> master -> C1",""],afterMarkdowns:["А в стані detached head:","","HEAD -> C1"],command:"git checkout C1",beforeCommand:""}},{type:"ModalAlert",options:{markdowns:["Щоб пройти цей рівень, давайте відокремимо голову від гілки `bugFix` й натомість спрямуємо її на якийсь коміт.","","Вкажи цей коміт за його hash (хеш, ідентифікатором). Хеш кожного коміту відображений в кружечку що символізує коміт."]}}]},vi:{childViews:[{type:"ModalAlert",options:{markdowns:["## Dịch chuyển trong Git","","Trước khi học thêm vài chức năng nâng cao trong Git, ta cần phải biết cách dịch chuyển qua lại các commit có trong kho chứa.","","Một khi bạn đã thành thao với chuyển dịch, khả năng sử dụng các lệnh git của bạn đã được nâng cao!","","","","",""]}},{type:"ModalAlert",options:{markdowns:["## HEAD","","Đầu tiên hãy bàn về 'HEAD'. HEAD là cái tên biểu tượng cho commit iện tại đang được trỏ đến -- về căn bản nó là commit mà bạn đang làm việc.","","HEAD luôn luôn trỏ đến commit gần nhất được phản ánh trong cây làm việc. Hầu hết các lệnh git mà làm thay đổi nội dung cây làm việc thường bắt đầu với HEAD.","","Bình thường HEAD thì trỏ tới tên nhánh (ví dụ bugFix). Khi bạn commit, thì trạng thái của bugFix được thay đổi và thay đổi này được trông thấy thông qua HEAD."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Xem thử thực tế nào. Ở đây ta sẽ bộc lộ HEAD trước và sau khi commit."],afterMarkdowns:["Thấy chứ? HEAD đã ẩn dưới nhánh `master` suốt."],command:"git checkout C1; git checkout master; git commit; git checkout C2",beforeCommand:""}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["### Tháo HEAD","","Tháo HEAD đơng giản nghĩa là dán nó vào một commit thay vì một nhánh. Lúc trước thì nó trông như thế này:","","HEAD -> master -> C1",""],afterMarkdowns:["Và bây giờ thì nó thế này","","HEAD -> C1"],command:"git checkout C1",beforeCommand:""}},{type:"ModalAlert",options:{markdowns:["Để hoàn thành cấp độ này, hãy tháo HEAD khỏi `bugFix` thay vì đó hãy dán nó vào commit.","","Chỉ rõ commit bằng mã băm (hash) của nó. Mã băm của mỗi commit nằm trong trong vòng tròn biểu thị commit đó."]}}]}}}},{}],125:[function(e,t,o){o.level={goalTreeString:"%7B%22branches%22%3A%7B%22master%22%3A%7B%22target%22%3A%22C4%27%22%2C%22id%22%3A%22master%22%7D%2C%22overHere%22%3A%7B%22target%22%3A%22C1%22%2C%22id%22%3A%22overHere%22%7D%7D%2C%22commits%22%3A%7B%22C0%22%3A%7B%22parents%22%3A%5B%5D%2C%22id%22%3A%22C0%22%2C%22rootCommit%22%3Atrue%7D%2C%22C1%22%3A%7B%22parents%22%3A%5B%22C0%22%5D%2C%22id%22%3A%22C1%22%7D%2C%22C2%22%3A%7B%22parents%22%3A%5B%22C1%22%5D%2C%22id%22%3A%22C2%22%7D%2C%22C3%22%3A%7B%22parents%22%3A%5B%22C2%22%5D%2C%22id%22%3A%22C3%22%7D%2C%22C4%22%3A%7B%22parents%22%3A%5B%22C3%22%5D%2C%22id%22%3A%22C4%22%7D%2C%22C5%22%3A%7B%22parents%22%3A%5B%22C4%22%5D%2C%22id%22%3A%22C5%22%7D%2C%22C3%27%22%3A%7B%22parents%22%3A%5B%22C1%22%5D%2C%22id%22%3A%22C3%27%22%7D%2C%22C5%27%22%3A%7B%22parents%22%3A%5B%22C3%27%22%5D%2C%22id%22%3A%22C5%27%22%7D%2C%22C4%27%22%3A%7B%22parents%22%3A%5B%22C5%27%22%5D%2C%22id%22%3A%22C4%27%22%7D%7D%2C%22HEAD%22%3A%7B%22target%22%3A%22master%22%2C%22id%22%3A%22HEAD%22%7D%7D",solutionCommand:"git rebase -i overHere --solution-ordering C3,C5,C4",compareOnlyMasterHashAgnostic:!0,disabledMap:{"git cherry-pick":!0},startTree:'{"branches":{"master":{"target":"C5","id":"master"},"overHere":{"target":"C1","id":"overHere"}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"},"C2":{"parents":["C1"],"id":"C2"},"C3":{"parents":["C2"],"id":"C3"},"C4":{"parents":["C3"],"id":"C4"},"C5":{"parents":["C4"],"id":"C5"}},"HEAD":{"target":"master","id":"HEAD"}}',hint:{en_US:"you can use either branches or relative refs (HEAD~) to specify the rebase target",es_AR:"podés usar tanto ramas como referencias relativas (HEAD~) para especificar el objetivo del rebase",es_ES:"puedes usar tanto ramas como referencias relativas (HEAD~) para especificar el objetivo del rebase",pt_BR:"Você pode usar ou ramos ou referências relativas (HEAD~) para especificar o alvo do rebase",gl:"Podes usar ramas ou referencias relativas (HEAD~) para especificar o obxectivo do rebase",de_DE:"Du kannst entweder Branches oder relative Ref-Angaben (z.B. HEAD~) benutzen, um das Ziel des Rebase anzugeben.",fr_FR:"Vous pouvez utiliser soit les branches, soit les références relatives (HEAD~) pour spécifier la cible à rebaser",zh_CN:"branch 或者是相对位置（HEAD~）都可以用來指定 rebase 的目标",zh_TW:"你可以指定 branch 或者是相對位置（HEAD~）來表示 rebase 的目標",ru_RU:"Можно использовать либо ветки, либо относительные ссылки (HEAD~), чтобы указать цель для Rebase",ja:"リベースする対象の指定には、ブランチ名や相対リファレンス(HEAD~)が使えます",ko:"리베이스할 타겟으로 브랜치나 상대 참조(HEAD~)를 사용할 수 있습니다",uk:"ти можеш використовувати гілки чи відносні посилання (HEAD~) щоб вказувати ціль для rebase",vi:"bạn có thể sử dụng tham chiếu tương đối (HEAD~) hoặc nhánh để chỉ định mục tiêu rebase"},name:{en_US:"Interactive Rebase Intro",es_AR:"Introducción al rebase interactivo",es_ES:"Introducción al rebase interactivo",pt_BR:"Introdução ao rebase interativo",gl:"Introducción ó rebase interativo",de_DE:"Einführung Interactive Rebase",ja:"インタラクティブrebase入門",fr_FR:"Introduction à rebase",zh_CN:"交互式 rebase",zh_TW:"介紹互動式的 rebase",ru_RU:"Введение в интерактивный Rebase",ko:"인터랙티브 리베이스 소개",uk:"Знайомство з інтерактивним rebase",vi:"Giới thiệu về tương tác rebase"},startDialog:{en_US:{childViews:[{type:"ModalAlert",options:{markdowns:["## Git Interactive Rebase","","Git cherry-pick is great when you know which commits you want (_and_ you know their corresponding hashes) -- it's hard to beat the simplicity it provides.","","But what about the situation where you don't know what commits you want? Thankfully git has you covered there as well! We can use interactive rebasing for this -- it's the best way to review a series of commits you're about to rebase.","","Let's dive into the details..."]}},{type:"ModalAlert",options:{markdowns:["All interactive rebase means is using the `rebase` command with the `-i` option.","","If you include this option, git will open up a UI to show you which commits are about to be copied below the target of the rebase. It also shows their commit hashes and messages, which is great for getting a bearing on what's what.","",'For "real" git, the UI window means opening up a file in a text editor like `vim`. For our purposes, I\'ve built a small dialog window that behaves the same way.']}},{type:"ModalAlert",options:{markdowns:["When the interactive rebase dialog opens, you have the ability to do 3 things:","","* You can reorder commits simply by changing their order in the UI (in our window this means dragging and dropping with the mouse).","* You can choose to completely omit some commits. This is designated by `pick` -- toggling `pick` off means you want to drop the commit.","* Lastly, you can squash commits. Unfortunately our levels don't support this for a few logistical reasons, so I'll skip over the details of this. Long story short, though -- it allows you to combine commits.","","Great! Let's see an example."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["When you hit the button, an interactive rebase window will appear. Reorder some commits around (or feel free to unpick some) and see the result!"],afterMarkdowns:["Boom! Git copied down commits in the exact same way you specified through the UI"],command:"git rebase -i HEAD~4 --aboveAll",beforeCommand:"git commit; git commit; git commit; git commit"}},{type:"ModalAlert",options:{markdowns:["To finish this level, do an interactive rebase and achieve the order shown in the goal visualization. Remember you can always `undo` or `reset` to fix mistakes :D"]}}]},fr_FR:{childViews:[{type:"ModalAlert",options:{markdowns:["## Git Interactive Rebase","","Git cherry-pick est pratique quand vous savez exactement quels commits vous voulez (_et_ que vous connaissez leurs identifiants) -- il est difficile de battre la simplicité qu'il procure.","","Mais que faire quand vous ne connaissez pas les identifiants des commits ? Heureusement git a pensé à vous pour ce cas-là ! Nous pouvons utiliser un rebase interactif pour cela -- c'est la meilleure façon de reconsidérer une série de commits que vous vous apprêtez à rebaser.","","Allons un peu plus dans les détails ..."]}},{type:"ModalAlert",options:{markdowns:["Tout rebase interactif signifie utiliser la commande `rebase` avec l'option `-i`.","","Si vous mettez cette option, git va ouvrir une interface graphique pour vous montrer quels commits vont être copiés en dessous de la cible sur laquelle vous rebasez. Elle vous montre aussi les identifiants et commentaires des commits, ce qui est pratique pour s'orienter parmi les commits.","","Pour le \"vrai\" git, l'interface graphique correspond en fait à ouvrir un fichier dans un éditeur de texte comme `vim`. Pour notre exemple, j'ai construit une petite fenêtre de dialogue qui se comporte de la même façon."]}},{type:"ModalAlert",options:{markdowns:["Quand le rebase interactif s'ouvre, vous avez la possibilité de faire 3 choses :","","* Vous pouvez réarranger les commits simplement en changeant leur ordre dans l'interface graphique (dans notre fenêtre de dialogue, cela signifie déplacer les objets dedans avec la souris -- drag and drop).","* Vous pouvez omettre certains commits. Cela est désigné par `pick` : cliquer sur `pick` désélectionne/resélectionne le commit.","* Enfin, vous pouvez écraser des commits. Malheureusement notre niveau ne supporte pas cette option, nous allons donc sauter les détails concernant cette possibilité. Pour faire court, cela vous permet de mélanger des commits.","","Super ! Voyons un exemple."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Quand vous activez le bouton, une fenêtre de rebase interactif va s'ouvrir. Reordonnez quelques commits (ou supprimez-en certains) et regardez le résultat !"],afterMarkdowns:["Boum ! Git a copié les commits de la même manière que vous l'aviez spécifié."],command:"git rebase -i HEAD~4 --aboveAll",beforeCommand:"git commit; git commit; git commit; git commit"}},{type:"ModalAlert",options:{markdowns:["Pour finir ce niveau, faites un rebase interactif et atteignez l'ordre indiqué dans le fenêtre d'objectif. Souvenez-vous que vous pouvez toujours exécuter les commandes `undo` ou `reset` pour réparer vos erreurs :D"]}}]},zh_TW:{childViews:[{type:"ModalAlert",options:{markdowns:["## git interactive rebase","","當你知道你要複製哪些 commit（而且你也知道他們所對應的 hash 值），那麼 `git cherry-pick`  很適合你。","","但是如果你不知道你要的是哪些 commit 呢？ 很幸運的是，git 也有考慮到這個問題喔！我們可以用互動式的 rebase 來做到，當你想要檢查你想要的 commit 的時候，這會是最好的方法。","","讓我們來看一下這些細節..."]}},{type:"ModalAlert",options:{markdowns:["互動式的 rebase 相當於使用 rebase 這個指令的時候，後面加上一個 `-i` 的選項。","","如果你有包含了這個選項，git 就會打開一個 UI，讓你知道說有哪些 commit 會被複製下來，它也會告訴你它們的 hash 值以及可以讓你知道它們是什麼的訊息。","",'在"實務上"，UI 會利用一個編輯器（例如 vim）打開一個檔案，對於我們來說，我已經設計了一個有同樣功能的對話視窗。']}},{type:"ModalAlert",options:{markdowns:["當互動式的 rebase 的對話視窗打開之後，你就可以做到三件事情：","","* 你可以藉由改變這些 commit 在 UI 的位置（在我們的視窗中，可以透過滑鼠去拖拉），來重新排序它們的順序。","* 你可以選擇完全忽略掉某些 commit，可以用滑鼠按一下，使它變暗，就表示你要忽略掉該 commit。","* 最後, 你可以把 commit 合併在一起，但基於某些理由，在我們的關卡裡面並沒有這個功能。","","太棒了！讓我們來看一個例子！"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["當你按下按鈕的時候，一個互動式的 rebase 的視窗就會跳出來，重新排序一些 commit（大膽忽略掉某些 commit），然後看一下結果吧！"],afterMarkdowns:["看吧！ git 根據你所選擇的 commit，把它們複製了下來。"],command:"git rebase -i HEAD~4 --aboveAll",beforeCommand:"git commit; git commit; git commit; git commit"}},{type:"ModalAlert",options:{markdowns:["要完成這個關卡，使用互動式的 rebase，並且完成視覺化目標所表示 commit 的順序，記住！你可以經常使用 `undo` 或者 `reset` 來修正你的一些錯誤:D"]}}]},zh_CN:{childViews:[{type:"ModalAlert",options:{markdowns:["## 交互式的 rebase","","当你知道你所需要的提交记录（**并且**还知道这些提交记录的哈希值）时, 用 cherry-pick 再好不过了 —— 没有比这更简单的方式了。","","但是如果你不清楚你想要的提交记录的哈希值呢? 幸好 Git 帮你想到了这一点, 我们可以利用交互式的 rebase —— 如果你想从一系列的提交记录中找到想要的记录, 这就是最好的方法了","","咱们具体来看一下……"]}},{type:"ModalAlert",options:{markdowns:["交互式 rebase 指的是使用带参数 `--interactive` 的 rebase 命令, 简写为 `-i`","","如果你在命令后增加了这个选项, Git 会打开一个 UI 界面并列出将要被复制到目标分支的备选提交记录，它还会显示每个提交记录的哈希值和提交说明，提交说明有助于你理解这个提交进行了哪些更改。","","在实际使用时，所谓的 UI 窗口一般会在文本编辑器 —— 如 Vim —— 中打开一个文件。 考虑到课程的初衷，我弄了一个对话框来模拟这些操作。"]}},{type:"ModalAlert",options:{markdowns:["当 rebase UI界面打开时, 你能做3件事:","","* 调整提交记录的顺序（通过鼠标拖放来完成）","* 删除你不想要的提交（通过切换 `pick` 的状态来完成，关闭就意味着你不想要这个提交记录）","* 合并提交。 遗憾的是由于某种逻辑的原因，我们的课程不支持此功能，因此我不会详细介绍这个操作。简而言之，它允许你把多个提交记录合并成一个。","","接下来咱们看个实例"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["当你点击下面的按钮时，会出现一个交互对话框。对提交记录做个排序（当然你也可以删除某些提交），点击确定看结果"],afterMarkdowns:["Git 严格按照你在对话框中指定的方式进行了复制。"],command:"git rebase -i HEAD~4",beforeCommand:"git commit; git commit; git commit; git commit"}},{type:"ModalAlert",options:{markdowns:["要通过本关, 做一次交互式的 rebase，整理成目标窗口中的提交顺序。 记住，你随时都可以用 `undo`、`reset` 修正错误，这是不会记入步数的 :D"]}}]},es_AR:{childViews:[{type:"ModalAlert",options:{markdowns:["## git rebase interactivo","","git cherry-pick es genial cuando sabés cuáles commits querés (_y_ sabés sus hashes) -- es dificil superar la simpleza que provee.","","Pero ¿qué pasa cuando no sabés qué commits querés? Por suerte ¡git te cubre en esta situación, también! Podemos usar el rebase interactivo para esto -- es la mejor manera de revisar una serie de commits que estás por rebasear.","","Entremos en los detalles..."]}},{type:"ModalAlert",options:{markdowns:["Todo rebase interactivo significa usar el comando `rebase` con la opción `-i`.","","Si incluís esta opción, git abrirá una UI para mostrarte qué commits están a punto de ser copiados sobre el objetivo del rebase. También muestra sus hashes y mensajes, que ayuda mucho para saber qué es cada commit.","",'Para el git "de verdad", la UI significa abrir un archivo en un editor de textos como `vim`. Para nuestro propósito, hice una pequeña interfaz que se comporta de ese mismo modo.']}},{type:"ModalAlert",options:{markdowns:["Cuando el diálogo de rebase interactivo se abre, tenés la capacidad de hacer 3 cosas:","","* Podés reordenar los commits con solamente cambiar su orden en la UI (en nuestra ventana, eso significa hacer drag & drop con el mouse).","* Podés elegir ignorar completamente algunos commits. Esto se designa con `pick` -- no hacerle `pick` a algún commit significa que querés ignorarlo.","* Finalmente, podés _squashear_ commits. Desafortunadamente, nuestros niveles no soportan esto por cuestiones logísticas, por lo que voy a ahorrarte los detalles. Haciéndola corta, te permite combinar varios commits en uno solo.","","¡Genial! Veamos un ejemplo."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Cuando apretes el botón, va a aparecer una ventana de rebase interactivo. Reordená los commits (sentite libre de ignorar alguno, también) ¡y mirá el resultado!"],afterMarkdowns:["¡Boom! Git copió los commits exactamente de la misma manera que lo especificaste en la UI"],command:"git rebase -i HEAD~4 --aboveAll",beforeCommand:"git commit; git commit; git commit; git commit"}},{type:"ModalAlert",options:{markdowns:["Para completar el nivel, hacé un rebase interactivo y alcanzá el orden que se muestra en la visualización objetivo. Acordate que siempre podés hacer `undo` y `reset` para arreglar errores :D"]}}]},es_ES:{childViews:[{type:"ModalAlert",options:{markdowns:["## git rebase interactivo","","git cherry-pick es genial cuando sabes qué commits quieres (_y_ sabes sus hashes) -- es dificil superar la simpleza que provee.","","Pero ¿qué pasa cuando no sabes qué commits quieres? Por suerte ¡git te cubre en esta situación, también! Podemos usar el rebase interactivo para esto -- es la mejor manera de revisar una serie de commits que estás a punto de rebasear.","","Entremos en los detalles..."]}},{type:"ModalAlert",options:{markdowns:["Todo rebase interactivo significa usar el comando `rebase` con la opción `-i`.","","Si incluyes esta opción, git abrirá una UI para mostrarte qué commits están a punto de ser copiados sobre el objetivo del rebase. También muestra sus hashes y mensajes, que ayuda mucho para saber qué es cada commit.","",'Para el git "de verdad", la UI signfica abrir un archivo en un editor de textos como `vim`. Para nuestro propósito, hice una pequeña interfaz que se comporta de ese mismo modo.']}},{type:"ModalAlert",options:{markdowns:["Cuando el diálogo de rebase interactivo se abre, tienes la capacidad de hacer 3 cosas:","","* Puedes reordenar los commits con solamente cambiar su orden en la UI (en nuestra ventana, eso significa hacer drag & drop con el mouse).","* Puedes elegir ignorar completamente algunos commits. Esto se designa con `pick` -- no hacerle `pick` a algún commit significa que quieres ignorarlo.","* Finalmente, puedes _squashear_ commits. Desafortunadamente, nuestros niveles no soportan esto por cuestiones logísticas, por lo que voy a ahorrarte los detalles. Resumiendo, te permite combinar varios commits en uno solo.","","¡Genial! Veamos un ejemplo."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Cuando aprietes el botón, va a aparecer una ventana de rebase interactivo. Reordena los commits (siéntete libre de ignorar alguno, también) ¡y observa el resultado!"],afterMarkdowns:["¡Zas! Git copió los commits exactamente de la misma manera que lo especificaste en la UI"],command:"git rebase -i HEAD~4 --aboveAll",beforeCommand:"git commit; git commit; git commit; git commit"}},{type:"ModalAlert",options:{markdowns:["Para completar el nivel, haz un rebase interactivo y alcanza el orden que se muestra en la visualización objetivo. Recuerda que siempre puedes hacer `undo` y `reset` para arreglar errores :D"]}}]},pt_BR:{childViews:[{type:"ModalAlert",options:{markdowns:["## Rebase Interativo do Git","","O cherry-pick é ótimo quando você sabe de antemão quais commits você quer (_e_ você sabe os hashes correspondentes) -- é difícil bater a simplicidade que ele oferece.","","Mas e quando você não sabe quais commits você quer? Felizmente o git pode te ajudar nesta situação também! Podemos usar o rebase interativo para isso -- trata-se da melhor forma de rever uma série de commits sobre os quais você está prestes a fazer um rebase.","","Mergulhemos nos detalhes..."]}},{type:"ModalAlert",options:{markdowns:["O rebase interativo é simplesmente o comando `rebase` com a opção `-i`.","","Se você incluir essa opção, o git abrirá uma interface para mostrar quais commits estão prestes a serem copiados abaixo do alvo do rebase. Ele também mostra os hashes e as mensagens dos commits, o que é ótimo para ter noção do que é o que.","",'No git "de verdade", a interface nada mais é que um arquivo aberto em um editor de texto (por exemplo o `vim`). Para os nossos propósitos, eu montei uma pequena janela que se comporta da mesma forma.']}},{type:"ModalAlert",options:{markdowns:["Quando a janela de rebase interativo abrir, você pode fazer 3 coisas diferentes:","","* Você pode reordenar os commits simplesmente mudando sua ordem na interface (na nossa janela isso significa arrastar e soltar com o mouse).","* Você pode escolher simplesmente omitir alguns commits. Para isso, clique no botão `pick` -- deixar o `pick` desligado significa que você quer descartar o commit.",'* Por fim, você pode "esmagar" (fazer squash) nos commits. Infelizmente, nosso tutorial não será capaz de cobrir essa funcionalidade por alguns motivos logísticos, então vamos pular os detalhes disto. Em resumo, no entanto, o squash permite que você combine commits.',"","Ótimo! Vejamos um exemplo."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Quando você clicar o botão, uma janela de rebase interativo se abrirá. Reordene alguns commits da forma como você preferir (ou sinta-se livre para desmarcar o `pick` de alguns) e veja o resultado!"],afterMarkdowns:["Boom! O Git copiou alguns commits exatamente da mesma forma que você os especificou na janela"],command:"git rebase -i HEAD~4 --aboveAll",beforeCommand:"git commit; git commit; git commit; git commit"}},{type:"ModalAlert",options:{markdowns:["Para finalizar este nível, faça um rebase interativo e obtenha a ordem mostrada na visualização do objetivo. Lembre-se que você pode usar os comandos `undo` ou `reset` para corrigir erros :D"]}}]},gl:{childViews:[{type:"ModalAlert",options:{markdowns:["## Rebase Interativo en Git","","Empregar cherry-pick é xenial cando coñeces qué commits queres (_e_ coñeces os seus códigos hash) -- é difícil mellorar a súa simplicidade.","","Pero ¿qué pasa cando non sabes qué commits son os que queres? Por sorte, ¡git cúbrete nesta situación tamén! Podemos empregar o rebase interactivo para esto -- é a mellor forma de revisar unha serie de commits que estás a rebasar.","","Mergullémonos nos detalles..."]}},{type:"ModalAlert",options:{markdowns:["O rebase interativo é o comando `rebase` coa opción `-i`.","","Se ti inclúes esta opción, o git abrirá unha interfaz para mostrar qué commits están hábiles para ser copiados sobre o obxectivo do rebase. Tamén amosa os seus códigos hash e mensaxes dos commits, o cal axuda moito para saber qué é cada commit.","",'En git "de verdade", a interfaz significa abrir un arquivo de texto nun editor (por exemplo `vim`). Para os nosos propósitos, aquí aparecerá unha pequena ventá que se comporta do mesmo xeito.']}},{type:"ModalAlert",options:{markdowns:["Cando a xanela de rebase interativo abra, poderás facer 3 cousas distintas:","","* Podes reordenar os commits simplemente cambiando a súa orde na interface (na nosa ventá significa arrastrar e soltar os commits).","* Podes escoller a opción de omitir algúns commits. Para iso, pincha no botón `pick` -- deixar o `pick` desligado significa que queres descartar o commit.",'* Ademáis, ti podes "esmagar" (fazer squash) nos commits. Tristemente, este tutorial non será capaz de cubrir esa funcionalidade por algúns motivos loxísticos, entón imos pulir algúns detalles ó respecto. Resumindo, o squash permite combinar commits.',"","¡Xenial! Vexamos un exemplo."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Cando pinches o botón, unha ventá de rebase interativo abrirase. Reordena algúns commits da forma que ti prefieras (ou se o prefires desmarca o `pick` de algúns) e mira o seu resultado!"],afterMarkdowns:["¡Veña! Git copiou algúns commits exatamente da mesma forma que o indicaches na ventá"],command:"git rebase -i HEAD~4 --aboveAll",beforeCommand:"git commit; git commit; git commit; git commit"}},{type:"ModalAlert",options:{markdowns:["Para finalizar este nivel, fai un rebase interativo e obteñaa a orde amosada na visualización do obxectivo. Lembra que podes usar os comandos `undo` ou `reset` para correxir erros :D"]}}]},de_DE:{childViews:[{type:"ModalAlert",options:{markdowns:["## Interaktiver Rebase","","Cherry-pick ist großartig wenn du genau weißt, welche Commits du willst (_und_ ihre jeweiligen Hashes kennst) -- es ist dann schwer an Einfachheit zu überbieten.","","Aber wie sieht es aus, wenn du die Commits nicht genau kennst, die du brauchst? Zum Glück bietet Git auch dafür eine Lösung an. Das können wir mit interaktivem Rebase machen -- die beste Art sich eine Serie von Commits in einem Rebase genau anzusehen.","","Schauen wir uns die Details an ..."]}},{type:"ModalAlert",options:{markdowns:["Interaktives Rebase bedeutet einfach nur, dass man dem `rebase` Befehl die Option `-i` hinzufügt.","","Wenn du das machst, zeigt Git dir jeden einzelnen Commit, der durch den Rebase kopiert werden würde. Es zeigt dir die Hashes und Kommentare, was gut ist um einen Überblick zu bekommen.","","In echtem Git besteht dieser Dialog daraus, die Commits in einem Text-Editor angezeigt zu bekommen. Für unsere Zwecke hab ich ein kleines Dialog-Fenster gebaut, dass sich ähnlich verhält."]}},{type:"ModalAlert",options:{markdowns:["Wenn sich der Dialog für den interaktiven Rebase öffnet, kannst du drei Dinge tun:","","* Du kannst die Reihenfolge der Commits durch Ziehen und Ablegen ändern.","* Du kannst Git sagen, einen Commit beim Rebase zu ignorieren -- im Dialog durch die Schaltfläche `pick` dargestellt.","* Außerdem kannst du Commit zusammenfassen (squash). Leider wird das hier nicht unterstützt, aber in echtem Git fasst es Commits zu einem zusammen.","","Super! Schauen wir uns ein Beispiel an."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Wenn du die Schaltfläche anklickst wird sich der Rebase-Dialog öffnen. Veränder die Reihenfolge der Commits oder klick bei einigen auf `pick` und schau dir das Ergebnis an."],afterMarkdowns:["Bämm! Git hat die Commits genau so kopiert, wie du es ausgewählt hast."],command:"git rebase -i HEAD~4 --aboveAll",beforeCommand:"git commit; git commit; git commit; git commit"}},{type:"ModalAlert",options:{markdowns:["Um dieses Level zu schaffen mach einen interaktiven Rebase, um genau die Reihenfolge zu erzeugen die im Ziel-Baum angezeigt wird. Denk daran, dass du jederzeit mit `undo` oder `reset` Fehler rückgängig machen kannst. :D"]}}]},ja:{childViews:[{type:"ModalAlert",options:{markdowns:["## Git インタラクティブrebase","","どのコミットを操りたいか（そしてそれを指定するハッシュ）がわかる時に`git cherry-pick`はとても便利で、その簡単さはとてもありがたいです。 ","","しかし、どのコミットを操りたいかがわからない時はどうでしょう？ありがたいことに、そんな時にぴったりのコマンドがgitに備わっています。このためにgitのインタラクティブrebaseを使えます。rebaseしたい一連のコミットを一括で見るベストな方法です。","","具体的に見てみましょう..."]}},{type:"ModalAlert",options:{markdowns:["インタラクティブrebaseとは単に、`rebase`コマンドに`-i`オプションを合わせて使うことです。","","このオプションをつければ、gitがインタフェースを開き、どのコミットがrebase対象の下にコピーされるかを確認できます。それらのコミットのハッシュやメッセージも表示され、rebaseの概要を一眼で見るのに便利です。","",'"ホンモノ"のgitでは、その「インターフェース」とは`vim`などのテキストエディタの中でファイルが開くだけです。ここでコンセプトを見せるために同じような動作をする小さなダイアログウィンドウを作りました。']}},{type:"ModalAlert",options:{markdowns:["インタラクティブrebaseダイアログが開くと、３つの操作から選べます:","","* UIウィンドウのなかで順番を調整するだけでコミットの順番を変えられます（こちらのダイアログでは、マウスでドラッグアンドドロップで操作します）。","* 特定のコミットを丸ごと除くこともできます。除きたいコミットを指定するには`pick`をオフにします。","* 最後に、コミットを組み合わせられます。技術的に制限があり再現できないのでその詳細な説明を省きますが、短く言いますと、複数のコミットを一つにまとめることができる機能です。","","さて、例を見てみましょう。"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["ボタンを押せば、インタラクティブrebaseウィンドウが現れます。コミットの順番を変更したり、`pick`を外したりしてみて、その結果を見てみましょう！"],afterMarkdowns:["よっしゃー。gitがUIで指定されたようにコミットをコピーしました！"],command:"git rebase -i HEAD~4 --aboveAll",beforeCommand:"git commit; git commit; git commit; git commit"}},{type:"ModalAlert",options:{markdowns:["このレベルをクリアするにはインタラクティブrebaseを実行し、ゴールのビジュアライズに表示されている順番を実現しましょう。ミスがあれば`undo`や`reset`で修正できるのをお忘れなく。"]}}]},ru_RU:{childViews:[{type:"ModalAlert",options:{markdowns:["## Git Interactive Rebase","","Git cherry-pick прекрасен, когда точно известно, какие коммиты нужны (и известны их точные хеши)","","Но как быть в случае, когда точно не известно какие коммиты нужны? К счастью, Git позаботился о таких ситуациях! Можно использовать интерактивный rebase для этого - лучший способ отобрать набор коммитов для rebase.","","Углубимся в детали."]}},{type:"ModalAlert",options:{markdowns:["Всё, что нужно для интерактивного rebase - это опция `-i`","","Если добавить эту опцию, Git откроет интерфейс просмотра того, какие коммиты готовы к копированию на цель rebase (target). Также показываются хеши коммитов и комментарии к ним, так что можно легко понять что к чему.","",'Для "реального" Git, этот интерфейс означает просто открытие файла в редакторе типа vim. Для этой обучалки, я сделал небольшое диалоговое окно, которое по сути делает то же, что и редактор.']}},{type:"ModalAlert",options:{markdowns:["После открытия окна интерактивного rebase есть три варианта для каждого коммита:","","* Можно сменить положение коммита по порядку, переставив строчку с ним в редакторе (у нас в окошке строку с коммитом можно перенести просто мышкой).",'* Можно "выкинуть" коммит из ребейза. Для этого есть `pick` - переключение его означает, что нужно выкинуть коммит.',"* Наконец, можно соединить коммиты. В этом уровне игры у нас не реализована эта возможность, но, вкратце, при помощи этой функции можно объединять изменения двух коммитов.","","Ну что ж, посмотрим на примеры!"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["После нажатия на эту кнопку появится окно интерактивного rebase. Переставь несколько коммитов (или удали кое-какие) и посмотри, что получится в итоге!"],afterMarkdowns:["Бах! Git скопировал коммиты в точности так, как было указано через интерфейс!"],command:"git rebase -i HEAD~4 --aboveAll",beforeCommand:"git commit; git commit; git commit; git commit"}},{type:"ModalAlert",options:{markdowns:["Чтобы пройти этот уровень, переставь коммиты при помощи интерактивного rebase в таком порядке, как указано на визуализации. На всякий случай, помни, что всегда можно исправить ошибку, вызвав команду undo или reset."]}}]},ko:{childViews:[{type:"ModalAlert",options:{markdowns:["## Git 인터렉티브 리베이스(Interactive Rebase)","","Git 체리-픽은 여러분이 원하는 커밋이 무엇인지 알때(각각의 해시값도) 아주 유용합니다 -- 체리-픽이 제공하는 간단함은 아주 매력적입니다.","","하지만 원하는 커밋을 모르는 상황에는 어쩌죠? 고맙게도 git은 이런상황에 대한 대안이 있습니다. 우리는 이럴 때 인터렉티브 리베이스를 사용하면됩니다 -- 리베이스할 일련의 커밋들을 검토할 수 있는 가장 좋은 방법입니다.","","자세히 알아보죠..."]}},{type:"ModalAlert",options:{markdowns:["인터렉티브 리베이스가 의미하는 뜻은 `rebase` 명령어를 사용할 때 `-i` 옵션을 같이 사용한다는 것입니다.","","이 옵션을 추가하면, git은 리베이스의 목적지가 되는 곳 아래에 복사될 커밋들을 보여주는 UI를 띄울것 입니다. 각 커밋을 구분할 수 있는 각각의 해시들과 메시지도 보여줍니다.","",'"실제"git 에서는 UI창을 띄우는것 대신에 `vim`과 같은 텍스트 편집기에서 파일을 엽니다. 저희는 배우는것이 목적이기에 같은 역할을 하는 작은 대화창을 만들어서 대신했습니다.']}},{type:"ModalAlert",options:{markdowns:["인터렉티브 리베이스 대화창이 열리면, 3가지를 할 수 있습니다:","","* 적용할 커밋들의 순서를 UI를 통해 바꿀수 있습니다(여기서는 마우스 드래그앤 드롭으로 가능합니다)","* 원하지 않는 커밋들을 뺄 수 있습니다. 이것은 `pick`을 이용해 지정할 수 있습니다(여기서는 `pick`토글 버튼을 끄는것으로 가능합니다)","* 마지막으로, 커밋을 스쿼시(squash)할 수 있습니다. 불행히도 저희 레벨은 몇개의 논리적 문제들 때문에 지원을 하지 않습니다. 이거에 대해서는 넘어가겠습니다. 요약하자면 커밋을 합칠 수 있습니다","","자! 예시를 확인해 봅시다."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["버튼을 누르면 인터렉티브 리베이스 대화창이 뜰것 입니다. 커밋들의 순서를 바꿔보고(커밋을 빼 봐도 됩니다) 결과를 확인해봅시다!"],afterMarkdowns:["Boom! Git이 UI를 통해 명시한 그대로 커밋들을 복사했습니다."],command:"git rebase -i HEAD~4 --aboveAll",beforeCommand:"git commit; git commit; git commit; git commit"}},{type:"ModalAlert",options:{markdowns:["이번 레벨을 통과하기 위해서 goal에 나타난 순서대로 만들기 위해 인터렉티브 리베이스를 사용해봅시다. `undo`와 `reset`을 통해 했던 실수들은 되돌릴 수 있습니다 :D"]}}]},uk:{childViews:[{type:"ModalAlert",options:{markdowns:["## Інтерактивний Rebase","","Git cherry-pick зручно користуватись, коли ти знаєш які коміти тобі потрібні (_і_ ти знаєш їхні хеші) -- важко вигадати щось простіше.","","Але що робити в ситуації, коли ти не знаєш які коміти потрібні? На щастя git може впоратись і з цим! Для цього випадку використовують інтерактивний rebase -- це найкращий спосіб перевірити серію комітів які потрібно заребейсити.","","Розглянемо це детальніше..."]}},{type:"ModalAlert",options:{markdowns:["Інтерактивний rebase це насправді команда  `rebase` з опцією `-i`.","","Якщо додати цю опцію, git відкриє діалог в якому покаже які коміти будуть скопійовані до кінцевого призначення. Він також покаже хеші комітів та їхні повідомлення, що допоможе розібратися що й до чого.","",'В "справжньому" git, замість UI вікна відкриється файл в сконфігурованому текстовому редакторі, можливо `vim`. Для цього туторіалу я створив невеличке діалогове вікно що поводиться приблизно так само.']}},{type:"ModalAlert",options:{markdowns:["Коли відкриється вікно інтерактивного rebase ти можеш зробити три речі:","","* Ти можеш переставити коміти між собою просто змінивши їх порядок в діалозі (в нашому вікні ти зможеш перетягнути їх мишкою).","* Ти можеш повністю пропустити якісь коміти. В туторіалі потрібно вимкнути опцію `pick`, але в справжньому гіт потрібно просто видалити відповідний рядок.","* Також можна розчавити (squash) якісь коміти. На жаль наш туторіал не підтримує цю фічу (так як ми не підтримуємо роботу з файлами), але це дуже зручна опція в справжньому гіт. За її допомогою можна декілька різніх комітів об’єднати в один.","","Чудово! Розгляньмо це на прикладі"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Коли ти натиснеш кнопку, відкриється вікно інтерактивного rebase. Перестав якісь коміти (можеш пропустити якісь якщо хочеш), і подивись що вийде!"],afterMarkdowns:["Ка-бум! Git cкопіював коміти відповідно до того що було вказано в UI"],command:"git rebase -i HEAD~4 --aboveAll",beforeCommand:"git commit; git commit; git commit; git commit"}},{type:"ModalAlert",options:{markdowns:["Щоб пройти цей рівень за допомогою інтерактивного rebase впорядкуй коміти як показано на візуалізації. Пам’ятай що ти завжди можеш використати `undo` чи `reset` щоб виправити помилку :D"]}}]},vi:{childViews:[{type:"ModalAlert",options:{markdowns:["## Git Rebase Tương tác","","Khi bạn biết rõ mình muốn những commit nào (và mã băm tương ứng của chúng) thì Git cherry-pick là công cụ tuyệt vời -- nó đơn giản đến bất ngờ.","","Nhưng mà lỡ như bạn không biết mình cần commit nào thì sao? May mà git cũng có công cụ cho việc này! Ta có thể dùng rebase tương tác cho việc này -- đó là cách tốt nhất để cân nhắc lựa chọn các commit mà bạn muốn rebase.","","Hãy đi sâu vào chi tiết nào..."]}},{type:"ModalAlert",options:{markdowns:["Rebase tương tác nghĩa là dùng lệnh `rebase` với tùy chọn `-i`.","","Nếu lệnh của bạn có bao hàm tùy chọn này, git sẽ mở một giao diện người dùng để cho bạn biết những commit nào sẽ được sao chép xuống dưới mục tiêu rebase. Nó cũng đồng thời thể hiện mã băm và thông điệp của commit, điều này là tuyệt vời bởi nhờ đó ta có thể phân biệt được chúng.","",'Với git "thật", cửa sổ UI (giao diện người dùng) sẽ được mở thông qua một tệp nhờ công cụ chỉnh sửa văn bản như là `vim`. Vì mục đích học tập, tôi đã xây dựng một cửa sổ hội thoại nhỏ mà nó hành xử cũng tương tự như vậy.']}},{type:"ModalAlert",options:{markdowns:["Khi hội thoại tương tác rebase bật lên, bạn có thể làm được 3 điều:","","* Bạn có thể sắp xếp lại commit một cách đơn giản thông qua UI (bạn có thể làm điều này bằng cách kéo thả trên công cụ của chúng tôi).","* Bạn có thẻ bỏ qua một vài commit. Điều này được thể hiện qua nút `pick` -- tắt nút `pick` nghĩa là bạn bỏ qua commit đó.","* Cuối cùng, bạn có thể nén các commit. Đáng tiếc là trình độ của chúng tôi chưa hỗ trợ được chức năng này do vài vấn đề logic, cho nên tôi sẽ bỏ qua phần này. Nói dơn giản thì -- nó cho phép bạn kết hợp các commit.","","Tuyệt! Cùng xem qua một ví dụ nào."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Khi bạn bấm nút, một cửa sổ tương tác rebase sẽ xuất hiện. Sắp xếp lại một vài commit (hoặc thậm chí bỏ qua một vài cái) và xem thử kết quả!"],afterMarkdowns:["BÙÙM! Git sao chép chính xác các commit mà bạn chọn thông qua UI"],command:"git rebase -i HEAD~4 --aboveAll",beforeCommand:"git commit; git commit; git commit; git commit"}},{type:"ModalAlert",options:{markdowns:["Để hoàn thành cấp độ này, do an interactive rebase and achieve the order shown in the goal visualization. Remember you can always `undo` or `reset` to fix mistakes :D"]}}]}}}},{}],126:[function(e,t,o){o.level={goalTreeString:'{"branches":{"master":{"target":"C2","id":"master"},"bugFix":{"target":"C4","id":"bugFix"}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"},"C2":{"parents":["C1"],"id":"C2"},"C3":{"parents":["C1"],"id":"C3"},"C4":{"parents":["C3"],"id":"C4"}},"HEAD":{"target":"C3","id":"HEAD"}}',solutionCommand:"git checkout bugFix^",startTree:'{"branches":{"master":{"target":"C2","id":"master"},"bugFix":{"target":"C4","id":"bugFix"}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"},"C2":{"parents":["C1"],"id":"C2"},"C3":{"parents":["C1"],"id":"C3"},"C4":{"parents":["C3"],"id":"C4"}},"HEAD":{"target":"master","id":"HEAD"}}',name:{en_US:"Relative Refs (^)",fr_FR:"Références relatives (^)",ja:"相対リファレンス (^)",zh_CN:"相对引用（^）",zh_TW:"相對引用（^）",es_AR:"Referencias relativas (^)",es_ES:"Referencias relativas (^)",pt_BR:"Referências relativas (^)",gl:"Referencias relativas (^)",de_DE:"Relative Referenzen (^)",ru_RU:"Относительные ссылки (^)",ko:"상대 참조 (^) (Relative Refs)",uk:"Відносні посилання",vi:"Tham chiếu tương đối (^)"},hint:{en_US:"Remember the Caret (^) operator!",fr_FR:"Rappelez-vous de l'opérateur circonflexe (^)",ja:"相対リファレンス(^)を思い出して！",de_DE:"Denk an den Dach-Operator (^)!",es_AR:"¡No te olvides del operador ^!",es_ES:"¡No te olvides del operador ^!",pt_BR:"Não se esqueça do operador circunflexo (^)",gl:"Non se esqueza do operador circunflexo (^)",zh_CN:"记住操作符（^）！",zh_TW:"不要忘記插入（^）符號！",ru_RU:"Не забудь оператор `^`",ko:"(^)연산자를 기억하세요!",uk:"Не забудь оператор `^`",vi:"Đừng quên dấu mũ (^)!"},startDialog:{en_US:{childViews:[{type:"ModalAlert",options:{markdowns:["## Relative Refs","","Moving around in Git by specifying commit hashes can get a bit tedious. In the real world you won't have a nice commit tree visualization next to your terminal, so you'll have to use `git log` to see hashes.","","Furthermore, hashes are usually a lot longer in the real Git world as well. For instance, the hash of the commit that introduced the previous level is `fed2da64c0efc5293610bdd892f82a58e8cbc5d8`. Doesn't exactly roll off the tongue...","","The upside is that Git is smart about hashes. It only requires you to specify enough characters of the hash until it uniquely identifies the commit. So I can type `fed2` instead of the long string above."]}},{type:"ModalAlert",options:{markdowns:["Like I said, specifying commits by their hash isn't the most convenient thing ever, which is why Git has relative refs. They are awesome!","","With relative refs, you can start somewhere memorable (like the branch `bugFix` or `HEAD`) and work from there.","","Relative commits are powerful, but we will introduce two simple ones here:","","* Moving upwards one commit at a time with `^`","* Moving upwards a number of times with `~<num>`"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Let's look at the Caret (^) operator first. Each time you append that to a ref name, you are telling Git to find the parent of the specified commit.","",'So saying `master^` is equivalent to "the first parent of `master`".',"","`master^^` is the grandparent (second-generation ancestor) of `master`","","Let's check out the commit above master here"],afterMarkdowns:["Boom! Done. Way easier than typing the commit hash"],command:"git checkout master^",beforeCommand:"git commit"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["You can also reference `HEAD` as a relative ref. Let's use that a couple of times to move upwards in the commit tree"],afterMarkdowns:["Easy! We can travel backwards in time with `HEAD^`"],command:"git checkout C3; git checkout HEAD^; git checkout HEAD^; git checkout HEAD^",beforeCommand:"git commit; git commit"}},{type:"ModalAlert",options:{markdowns:["To complete this level, check out the parent commit of `bugFix`. This will detach `HEAD`.","","You can specify the hash if you want, but try using relative refs instead!"]}}]},fr_FR:{childViews:[{type:"ModalAlert",options:{markdowns:["## Références relatives","","Se déplacer dans Git en spécifiant des identifiants de commits (hashes) peut être un peu agaçant. Dans le monde réel vous n'aurez pas une vue sur un joli arbre des commits à côté de votre terminal, ainsi vous aurez à utiliser `git log` pour connaître les identifiants.","","De plus, les identifiants sont plus longs dans le vrai monde de Git qu'ici. Par exemple, l'identifiant du commit introduit au précédent niveau était `fed2da64c0efc5293610bdd892f82a58e8cbc5d8`. Difficilement mémorisable ...","","Le côté positif est que Git est intelligent avec les identifiants. Vous avez seulement à spécifier les premiers caractères de l'identifiant jusqu'à ce qu'il reconnaisse exactement le commit. Ainsi je peux taper `fed2` au lieu de la longue chaîne ci-dessus."]}},{type:"ModalAlert",options:{markdowns:["Comme je l'ai dit, spécifier un commit par son identifiant n'est pas très pratique, c'est pourquoi Git a des références relatives. Elles sont géniales !","","Avec les références relatives vous pouvez commencer par vous placer à un endroit mémorisable (comme la branche `bugFix` ou `HEAD`) et travailler depuis ici.","","Les commits relatifs sont puissants, et on va en introduire deux simples ici :","","* Revenir d'un commit en arrière avec `^`","* Revenir de plusieurs en arrière avec `~<num>`"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Regardons l'opérateur circonflexe (^) d'abord. Chaque fois que vous le faites suivre un nom de référence, vous êtes en train de demander à Git de trouver le parent du commit spécifié.","",'Ainsi, `master^` est équivalent à "le premier parent de `master`".',"","`master^^` est le grand-parent (ancêtre de seconde génération) de `master`","","Faisons un checkout du commit avant master."],afterMarkdowns:["Boum ! Fini. Bien plus facile qu'écrire l'identifiant du commit."],command:"git checkout master^",beforeCommand:"git commit"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Vous pouvez aussi utiliser `HEAD` comme une référence relative. Utilisons cela plusieurs fois pour remonter l'arbre des commits."],afterMarkdowns:["Facile ! Nous pouvons voyager dans le temps avec `HEAD^`"],command:"git checkout C3; git checkout HEAD^; git checkout HEAD^; git checkout HEAD^",beforeCommand:"git commit; git commit"}},{type:"ModalAlert",options:{markdowns:["Pour compléter ce niveau, faites un checkout du commit parent de `bugFix`. Cela va détacher `HEAD`.","","Vous pouvez spécifier l'identifiant du commit si vous voulez, mais essayez plutôt d'utiliser les références relatives !"]}}]},de_DE:{childViews:[{type:"ModalAlert",options:{markdowns:["## Relative Referenzen","","Es kann etwas mühselig werden, sich in einem Commit-Baum mittels Angabe der Hashes zu bewegen. Im echten Leben hat man normalerweise keine hübsche Visualisierung des Baumes neben seinem Terminal, also benutzt man `git log` um die Hashes zu sehen.","","Außerdem sind die echten Hashes sehr viel länger und nicht fortlaufend nummeriert. Beispielsweise heißt der Hash, mit dem ich den letzten Level committet habe, in echt `fed2da64c0efc5293610bdd892f82a58e8cbc5d8`. Nicht gerade einprägsam ...","","Zum Glück ist Git intelligent wenn es um die Hashes geht. Du musst nur soviele Zeichen eines Hashes angeben, bis der Hash eindeutig ist. Ich kann also `fed2` eingeben anstatt die komplette Zeichenkette tippen zu müssen."]}},{type:"ModalAlert",options:{markdowns:["Wie ich schon sagte: Commits über ihren Hash zu referenzieren ist nicht gerade der bequemste Weg. Weshalb es in Git relative Referenzen gibt. Welche super sind!","","Mit relativen Referenzen kann man bei einem leicht zu merkenden Bezeichner anfangen (zum Beispiel dem Branch-Namen `bugFix` oder der Referenz `HEAD`) und sich von dort vorarbeiten.","","Relative Referenzierung von Commits kann komplex sein, aber wir starten mit zwei einfachen Beispielen:","","* Geh einen Commit zurück mit `^`","* Geh eine bestimmte Anzahl von Commits zurück mit `~<Anzahl>`"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Schauen wir uns zuerst den Dach-Operator (`^`) an. Jedes mal wenn du ihn hinter einen Referenz-Namen setzt, sagst du Git damit, dass es zum Vorgänger des angegebenen Commits gehen soll.","",'Das heißt `master^` ist gleichbedeutend mit "direkter Vorgänger des Commits, auf den `master` zeigt".',"","`master^^` ist also der Vorgänger des Vorgängers von `master`.","","Wir checken jetzt mal den Commit vor `master` aus:"],afterMarkdowns:["Bämm! Fertig. Einfacher, als den Commit-Hash zu tippen (oder zu kopieren)."],command:"git checkout master^",beforeCommand:"git commit"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Du kannst auch `HEAD` als Basis für relative Referenzen benutzen. Lass uns das ein paar Mal verwenden, um uns im Commit-Baum nach oben zu bewegen."],afterMarkdowns:["Das war einfach. Wir reisen mit `HEAD^` in der Zeit zurück."],command:"git checkout C3; git checkout HEAD^; git checkout HEAD^; git checkout HEAD^",beforeCommand:"git commit; git commit"}},{type:"ModalAlert",options:{markdowns:["Um dieses Level abzuschließen musst du den direkten Vorgänger von `bugFix` auschecken. Dadurch wirst du `HEAD` von `bugFix` abkoppeln.","","Du kannst natürlich den Hash angeben, aber versuch doch relative Referenzen zu benutzen!"]}}]},es_AR:{childViews:[{type:"ModalAlert",options:{markdowns:["## Referencias relativas","","Moverse por git usando los hashes de los commits puede volverse un tanto tedioso. En el mundo real no vas a tener una visualización de commits tan linda en la terminal, así que vas a tener que usar `git log` para ver los hashes.","","Peor aún, los hashes en general son mucho más largos en el git real, también. Por ejemplo, el hash del commit que introduje en el nivel anterior es `fed2da64c0efc5293610bdd892f82a58e8cbc5d8`. No es algo particularmente fácil de nombrar...","","Lo copado es que git es bastante astuto con los hashes. Sólo requiere que especifiques una cantidad de caracteres suficientes para identificar unívocamente al commit. Entonces, yo podría simplemente tipear `fed2` en lugar de esa cadena larga de arriba."]}},{type:"ModalAlert",options:{markdowns:["Como ya dije, especificar los commits por su hash no es la manera más conveniente, y por eso git tiene referencias relativas. ¡Son geniales!","","Con las referencias relativas podés arrancar de algún lugar recordable (como la rama `bugFix`, o `HEAD`) y manejarte desde ahí.","","Los commits relativos son poderosos, pero ahora vamos a presentar sólo dos formas simples:","","* Moverse un commit atrás con `^`","* Moverse una cantidad de commits atrás con `~<num>`"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Veamos el operador ^ primero. Cada vez que le agregás eso al nombre de una referencia, le estás diciendo a git que use el padre del commit especificado.","",'Entonces, decir `master^` es equivalente a "el primer padre de `master`".',"","`master^^` es el _abuelo_ (segunda generación de ancestros) de `master`","","Veamos el commit que está antes de master acá"],afterMarkdowns:["¡Boom! Ahí está. Mucho más simple que tipear el hash de ese commit"],command:"git checkout master^",beforeCommand:"git commit"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["También podés referenciar a `HEAD` como una referencia relativa. Usémoslo un par de veces para movernos hacia atrás en nuestro árbol"],afterMarkdowns:["¡Fácil! Podemos volver en el tiempo con `HEAD^`"],command:"git checkout C3; git checkout HEAD^; git checkout HEAD^; git checkout HEAD^",beforeCommand:"git commit; git commit"}},{type:"ModalAlert",options:{markdowns:["Para completar este nivel, checkouteá el padre del commit de `bugFix`. Esto va a detachear a `HEAD`.","","Podés especificar el hash si querés, pero mejor ¡tratá de usar la referencia relativa!"]}}]},es_ES:{childViews:[{type:"ModalAlert",options:{markdowns:["## Referencias relativas","","Moverse por git usando los hashes de los commits puede volverse un tanto tedioso. En el mundo real no vas a tener una visualización de commits tan linda en la terminal, así que vas a tener que usar `git log` para ver los hashes.","","Peor aún, los hashes en general son mucho más largos en el git real, también. Por ejemplo, el hash del commit que introduje en el nivel anterior es `fed2da64c0efc5293610bdd892f82a58e8cbc5d8`. No es algo particularmente fácil de nombrar...","","Lo interesante es que git es bastante astuto con los hashes. Sólo requiere que especifiques una cantidad de caracteres suficientes para identificar unívocamente al commit. Entonces, yo podría simplemente tipear `fed2` en lugar de esa cadena larga de arriba."]}},{type:"ModalAlert",options:{markdowns:["Como ya dije, especificar los commits por su hash no es la manera más conveniente, y por eso git tiene referencias relativas. ¡Son geniales!","","Con las referencias relativas puedes arrancar de algún lugar recordable (como la rama `bugFix`, o `HEAD`) y trabajar desde ahí.","","Los commits relativos son poderosos, pero ahora vamos a presentar sólo dos formas simples:","","* Moverse un commit hacia atrás con `^`","* Moverse una cantidad de commits hacia atrás con `~<num>`"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Veamos el operador ^ primero. Cada vez que le agregas eso al nombre de una referencia, le estás diciendo a git que use el padre del commit especificado.","",'Entonces, decir `master^` es equivalente a "el primer padre de `master`".',"","`master^^` es el _abuelo_ (segunda generación de ancestros) de `master`","","Veamos el commit que está antes de master aquí"],afterMarkdowns:["¡Zas! Ahí está. Mucho más simple que escribir el hash de ese commit"],command:"git checkout master^",beforeCommand:"git commit"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["También puedes referenciar a `HEAD` como una referencia relativa. Usémoslo un par de veces para movernos hacia atrás en nuestro árbol"],afterMarkdowns:["¡Fácil! Podemos volver en el tiempo con `HEAD^`"],command:"git checkout C3; git checkout HEAD^; git checkout HEAD^; git checkout HEAD^",beforeCommand:"git commit; git commit"}},{type:"ModalAlert",options:{markdowns:["Para completar este nivel, haz checkout sobre el padre del commit de `bugFix`. Esto va a detachear a `HEAD`.","","Puedes especificar el hash si quieres, pero mejor ¡trata de usar la referencia relativa!"]}}]},pt_BR:{childViews:[{type:"ModalAlert",options:{markdowns:["## Referências relativas","","Mover-se pela árvore do Git especificando o hash do commit pode se tornar um pouco entediante. No mundo real, você não terá à sua disposição essa bonita visualização da árvore ao lado do seu terminal, então você terá de usar o comando `git log` para ver os hashes.","","Além disso, os hashes são geralmente muito maiores no mundo real. Por exemplo, o hash do commit que introduziu o nível de exercícios anterior é `fed2da64c0efc5293610bdd892f82a58e8cbc5d8`. Não é algo exatamente fácil de lembrar.","","O que salva é que o Git é inteligente com os hashes. Ele só exige que você especifique a quantidade de caracteres do hash suficiente para identificar unicamente o commit. Então eu posso digitar apenas `fed2` em vez da grande string acima."]}},{type:"ModalAlert",options:{markdowns:["Como eu disse, especificar commits pelo hash não é a sempre o mais conveniente, e é por isso que o Git suporta referências relativas. Elas são fantásticas!","","Com referências relativas, você pode começar a partir de um ponto fácil de lembrar (como o ramo `bugFix` ou o `HEAD`) e referenciar a partir dali.","","Commits relativos são poderosos, mas vamos introduzir apenas dois tipos simples aqui:","","* Mover para cima um commit por vez com `^`","* Mover para cima um número de vezes com `~<num>`"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Vamos dar uma olhada no operador circunflexo (^) primeiro. Cada vez que você adicioná-lo a um nome de referência, você está dizendo ao Git para encontrar o pai do commit especificado.","",'Então, dizer `master^` é equivalente a "o primeiro pai do `master`".',"","`master^^` é o avô (ancestral de segunda geração) do `master`","","Vamos fazer checkout do commit logo acima do master"],afterMarkdowns:["Boom! Pronto. Muito mais fácil que digitar o hash do commit"],command:"git checkout master^",beforeCommand:"git commit"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Você também pode usar o `HEAD` como parte de uma referência relativa. Vamos usar isso para nos mover para cima algumas vezes na árvore de commits"],afterMarkdowns:["Fácil! Podemos viajar para trás no tempo com `HEAD^`"],command:"git checkout C3; git checkout HEAD^; git checkout HEAD^; git checkout HEAD^",beforeCommand:"git commit; git commit"}},{type:"ModalAlert",options:{markdowns:["Para completar esse nível, faça checkout do commit pai de `bugFix`. Isso soltará o `HEAD`.","","Você pode especificar o hash se quiser, mas tente usar referências relativas em vez disso!"]}}]},gl:{childViews:[{type:"ModalAlert",options:{markdowns:["## Referencias relativas","","Moverse por a árbore de git usando os códigos hash dos commits pode volverse un pouco tedioso. Neste mundo real non vas ter unha visualización dos commits tan bonita no terminal, así que vas ter que usar `git log` para ver cada código hash.","","Inda peor, os códigos hash són xeralmente moito máis grandes no mundo real. Por exemplo, o hash do commit que introduxemos no nivel anterior é `fed2da64c0efc5293610bdd892f82a58e8cbc5d8`. Non é algo sinxelo de lembrar.","","O bo é que git aínda afina cos hashes. El só precisa que expecifiques a cantidade mínima de caracteres suficientes para identificar unívocamente ó commit. Entón eu podo escribir `fed2` e non o hash completo."]}},{type:"ModalAlert",options:{markdowns:["Como xa dixemos, indicar os commits polo seu código hash non é a forma máis convinte, e é por eso que git ten referencias relativas. ¡Son a caña!","","Cas referencias relativas, podes comezar por un punto sinxelo de lembrar (como a rama `bugFix` ou o `HEAD`) e referenciar a partir de ahí.","","Os commits relativos son poderosos, pero agora imos presentar só dous formas sinxelas:","","* Moverse un commit por riba con `^`","* Mover unha cantidade de commits atrás con `~<num>`"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Votémoslle unha ollada o operador (^) primeiro. Cada vez que o engadimos a unha referencia, estaslle dicindo a commit que queres o pai de esa referencia.","",'Entón, dicir `master^` é equivalente a "o primeiro pai do `master`".',"","`master^^` é o avó (ancestral de segunda xeración) do `master`","","Imos facer checkout do commit que está enriba de master"],afterMarkdowns:["Boom! Ahí o tes. Moito máis rápido que por o hash do commit"],command:"git checkout master^",beforeCommand:"git commit"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Tamén podes usar o `HEAD` como parte dunha referencia relativa. Ímolo utilizar para nos mover uns commits cara arriba na árbore."],afterMarkdowns:["¡Chupado! Podemos viaxar cara atrás no tempo con `HEAD^`"],command:"git checkout C3; git checkout HEAD^; git checkout HEAD^; git checkout HEAD^",beforeCommand:"git commit; git commit"}},{type:"ModalAlert",options:{markdowns:["Para completar este nivel, fai checkout do commit pai de `bugFix`. Iso soltará o `HEAD`.","","¡Podes indicar o hash que queiras, pero intenta empregar as referencias relativas, é moito mellor!"]}}]},zh_CN:{childViews:[{type:"ModalAlert",options:{markdowns:["## 相对引用","","通过指定提交记录哈希值的方式在 Git 中移动不太方便。在实际应用时，并没有像本程序中这么漂亮的可视化提交树供你参考，所以你就不得不用 `git log` 来查查看提交记录的哈希值。","","并且哈希值在真实的 Git 世界中也会更长（译者注：基于 SHA-1，共 40 位）。例如前一关的介绍中的提交记录的哈希值可能是 `fed2da64c0efc5293610bdd892f82a58e8cbc5d8`。舌头都快打结了吧...","","比较令人欣慰的是，Git 对哈希的处理很智能。你只需要提供能够唯一标识提交记录的前几个字符即可。因此我可以仅输入`fed2` 而不是上面的一长串字符。"]}},{type:"ModalAlert",options:{markdowns:["正如我前面所说，通过哈希值指定提交记录很不方便，所以 Git 引入了相对引用。这个就很厉害了!","","使用相对引用的话，你就可以从一个易于记忆的地方（比如 `bugFix` 分支或 `HEAD`）开始计算。","","相对引用非常给力，这里我介绍两个简单的用法：","","* 使用 `^` 向上移动 1 个提交记录","* 使用 `~<num>` 向上移动多个提交记录，如 `~3`"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["首先看看操作符 (^)。把这个符号加在引用名称的后面，表示让 Git 寻找指定提交记录的父提交。","","所以 `master^` 相当于“`master` 的父节点”。","","`master^^` 是 `master` 的第二个父节点","","现在咱们切换到 master 的父节点"],afterMarkdowns:["搞定。这种方式是不是比输入哈希值方便多了？！"],command:"git checkout master^",beforeCommand:"git commit"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["你也可以将 `HEAD` 作为相对引用的参照。下面咱们就用 `HEAD` 在提交树中向上移动几次。"],afterMarkdowns:["很简单吧？！我们可以一直使用 `HEAD^` 向上移动。"],command:"git checkout C3; git checkout HEAD^; git checkout HEAD^; git checkout HEAD^",beforeCommand:"git commit; git commit"}},{type:"ModalAlert",options:{markdowns:["要完成此关，切换到 `bugFix` 的父节点。这会进入分离 `HEAD` 状态。","","如果你愿意的话，使用哈希值也可以过关，但请尽量使用相对引用！"]}}]},zh_TW:{childViews:[{type:"ModalAlert",options:{markdowns:["## 相對引用","","如果要在 git 中移動，透過指定 commit 的 hash 值的方式會變得比較麻煩。在實際例子中，你的終端機上面不會出現漂亮且具備視覺效果的 commit tree，所以你不得不用 `git log` 來查詢 hash 值。","","另外，hash 值的長度在真實的 git 環境中很長。舉個例子，前一個關卡的介紹中的 commit 的 hash 值是 `fed2da64c0efc5293610bdd892f82a58e8cbc5d8`。舌頭不要打結了...","","幸運的是，git 對於處理 hash 值很有一套。你只需要提供能夠唯一辨識出該 commit 的前幾個字元就可以了。所以，我可以只輸入 `fed2` 而不是上面的一長串字元。"]}},{type:"ModalAlert",options:{markdowns:["我說過，透過 hash 值來指定 commit 不是很方便，所以 git 加入了相對引用。這個就很厲害了!","","使用相對引用，你可以從一個易於記憶的地方（比如說 branch 名稱 `bugFix` 或 `HEAD`）開始工作。","","相對引用非常好用，這裡我介紹兩個簡單的用法：","","* 使用 `^` 向上移動一個 commit","* 使用 `~<num>` 向上移動多個 commit"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["首先看看插入（^）這一個符號。把這個符號接在某一個 reference 後面，就表示你告訴 git 去找到該 reference 所指向的 commit 的 parent commit。","",'所以 `master^` 相當於 "`master` 的 parent commit"。',""," `master^^` 是 `master` 的 grandparent commit（往前推兩代）","","切換到 master的 parent commit"],afterMarkdowns:["看吧！完成了。這種方式比輸入代表 commit 的 hash 值簡單多了！"],command:"git checkout master^",beforeCommand:"git commit"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["你也可以把 `HEAD` 當作相對引用。以下指令使用 `HEAD` 在 commit tree 中向上移動數次。"],afterMarkdowns:["簡單吧！我們可以一直使用 `HEAD^` 向上移動。"],command:"git checkout C3; git checkout HEAD^; git checkout HEAD^; git checkout HEAD^",beforeCommand:"git commit; git commit"}},{type:"ModalAlert",options:{markdowns:["要完成這一關，切換到 `bugFix` 的 parent commit。這會分離出 `HEAD`。","","如果你願意的話，透過直接指定 hash 值的方式也可以過關，但是還是試試看相對引用吧！"]}}]},ja:{childViews:[{type:"ModalAlert",options:{markdowns:["## 相対リファレンス","","コミットのハッシュを利用してgitの中で移動するのも少し疲れる時もあります。現実の世界では、このチュートリアルのようにターミナルの隣に見やすいツリーのビジュアライズがないので、ハッシュを見るには`git log`を使う必要があります。","","その上、実際のハッシュはこちらで見たものよりずっと長いです。例えば、先ほどのレベルの紹介のコミットハッシュは`fed2da64c0efc5293610bdd892f82a58e8cbc5d8`です。少し覚えにくいですね...","","そのため、gitでは手短くコミットを指定する方法があります。ユニークな存在だと確認できるだけのハッシュの字数を入力すれば良いです -- 上記の長い文字列の代わりに`fed2`を入力するだけで済みます。"]}},{type:"ModalAlert",options:{markdowns:["先ほど言いましたように、ハッシュでコミットを指定するのがめんどくさくなる時もあるので、gitには相対リファレンスという素晴らしい機能があります。","","相対リファレンスを使うことで、覚えやすい位置（例えば`bugFix`ブランチや`HEAD`）から始め、そのところから相対的な位置を指定できます。","","相対コミットは強力ですが、ここでは二つをご紹介します:","","* 一つずつ上へ移動させる`^`（カレット）","* 複数回上へ移動させる `~<num>`"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["まずはカレット(^)から始めましょう。リファレンス名にカレットを追加すると、指定コミットの親コミットを見つけるようにとgitに命令を出しています。","",'なので `master^`と記述すれば、"`master`の一個上の親"、という意味になります。',"","そして`master^^`とはその親の一つの上のコミット(２代前の親)を指します。","","masterの上のコミットをここで見てみましょう"],afterMarkdowns:["やりました！コミットハッシュを書くよりずっと簡単ですね。"],command:"git checkout master^",beforeCommand:"git commit"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["`HEAD`を相対リファレンスとして参照することもできます。 ここで数回そのコマンドを使い、コミットツリーの中で上へと移動しましょう。"],afterMarkdowns:["簡単ですね!`HEAD^`で時間を巻き戻せます。"],command:"git checkout C3; git checkout HEAD^; git checkout HEAD^; git checkout HEAD^",beforeCommand:"git commit; git commit"}},{type:"ModalAlert",options:{markdowns:["このレベルをクリアするには、`bugFix`の親コミットをチェックアウトしてください。その操作により`HEAD`が分離されます。","","ハッシュを使用してもいいですが、その代わりに相対リファレンスを試してみましょう！"]}}]},ru_RU:{childViews:[{type:"ModalAlert",options:{markdowns:["## Относительные ссылки","","Передвигаться по дереву Git при помощи указания хешей коммитов немного неудобно. В реальной ситуации у вас вряд ли будет красивая визуализация дерева в терминале, так что придётся каждый раз использовать `git log`, чтобы найти хеш нужного коммита","","Более того, хеши в реальном репозитории Git намного более длинные. Например, хеш для коммита, который приведён в предыдущем уровне - `fed2da64c0efc5293610bdd892f82a58e8cbc5d8`. Не очень просто для произношения =)","","Хорошая новость в том, что Git достаточно умён в работе с хешами. Ему нужны лишь первые несколько символов для того, чтобы идентифицировать конкретный коммит. Так что можно написать просто `fed2` вместо колбасы выше."]}},{type:"ModalAlert",options:{markdowns:["Как мы уже говорили, указание на коммит при помощи его хеша - не самый удобный способ, поэтому Git поддерживает относительные ссылки и они прекрасны!","","С относительными ссылками можно начать с какого-либо удобного места (например, с ветки `bugFix` или от HEAD) и двигаться от него","","Относительные ссылки - мощный инструмент, но мы покажем два простых способа использования:","","* Перемещение на один коммит назад `^`","* Перемещение на <num> коммитов назад `~<num>`"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Для начала рассмотрим оператор каретки (^). Когда мы добавляем его к имени ссылки, Git воспринимает это как указание найти родителя указанного коммита.","",'Так что `master^` означает "первый родитель ветки `master`".',"","`master^^` означает прародитель (родитель родителя) `master`","","Давайте переключимся на коммит Выше `master`"],afterMarkdowns:["Опачки! Готово. Сильно проще, чем поиск и указание хеша."],command:"git checkout master^",beforeCommand:"git commit"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Можно также использовать `HEAD` как относительную ссылку. Попробуем пройти несколько раз назад по дереву коммитов"],afterMarkdowns:["Изи! Мы можем путешествовать во времени при помощи `HEAD^`"],command:"git checkout C3; git checkout HEAD^; git checkout HEAD^; git checkout HEAD^",beforeCommand:"git commit; git commit"}},{type:"ModalAlert",options:{markdowns:["Чтобы пройти этот уровень, переместись на первого родителя ветки `bugFix`. Это отделит `HEAD` от ветки.","","Конечно, можно указать хеш, но надо попробовать использовать относительные ссылки!"]}}]},ko:{childViews:[{type:"ModalAlert",options:{markdowns:["## 상대 참조","","Git에서 여기저기 이동할 때 커밋의 해시를 사용하는 방법은 조금 귀찮습니다. 실제로 Git을 사용할 때는 터미널화면 옆에 예쁘장하게 커밋트리가 보이진 않으니까요. 매번 해시를 확인하려고 `git log` 명령어를 치고 있을 겁니다.","","나아가서, 실제 Git에서는 해시들이 훨씬 더 깁니다. 예를 들어  이전 레벨에 소개했던 커밋의 해시는 `fed2da64c0efc5293610bdd892f82a58e8cbc5d8`입니다. 쓰기 쉬워 보이진 않네요....","","다행히도, Git은 똑똑합니다. 해시가 커밋의 고유한 값임을 보여줄 수 있을 만큼만 명시해주면 됩니다. 위의 긴 문자열 대신 `fed2`만 입력해도 되는 겁니다."]}},{type:"ModalAlert",options:{markdowns:["말했듯이, 커밋들을 해시로 구분하고 사용하는것이 아주 편하다고 볼 수는 없습니다. Git의 상대 참조(Relative Ref)가 여기서 등장합니다. 굉장한 기능입니다.","","상대 참조로 우리가 기억할 만한 지점(브랜치 `bugFix`라던가 `HEAD`라던가)에서 출발해서 이동하여 다른 지점에 도달해 작업을 할 수 있습니다.","","상대 커밋은 강력한 기능인데, 여기서 두가지 간단한 방법을 소개하겠습니다.","","* 한번에 한 커밋 위로 움직이는 `^`","* 한번에 여러 커밋 위로 올라가는 `~<num>`"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["먼저 캐럿 (^) 연산자 부터 알아보겠습니다. 참조 이름에 하나씩 추가할 때마다, 명시한 커밋의 부모를 찾게 됩니다.","",'`master^`는 "`master`의 부모"와 같은 의미 입니다.',"",'`master^^` 는 "`master`의 조부모(부모의 부모)"를 의미합니다',"","master 위에 있는 부모를 체크아웃 해 봅시다."],afterMarkdowns:["Boom! 됬습니다. 커밋의 해시를 입력하는 것보다 훨씬 쉬운 방법입니다."],command:"git checkout master^",beforeCommand:"git commit"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["또한 참조인 `HEAD`도 상대참조를 위해 사용할 수 있습니다. 커밋트리 위쪽으로 움직이기위해 여러번 사용 해 봅시다."],afterMarkdowns:["쉽군요! 이제 우린 `HEAD^`를 통해 시간을 거슬러 올라갈 수 있습니다."],command:"git checkout C3; git checkout HEAD^; git checkout HEAD^; git checkout HEAD^",beforeCommand:"git commit; git commit"}},{type:"ModalAlert",options:{markdowns:["이 레벨을 완료하기 위해서는, `bugFix`의 부모 커밋을 체크아웃 하십시오. 이렇게 하면 `HEAD`가 분리 될 것입니다.","","해시를 이용해서도 할 수 있지만, 상대 참조를 활용하는 것을 연습해 보세요!"]}}]},uk:{childViews:[{type:"ModalAlert",options:{markdowns:["## Відносні посилання","","Пересуватися по гіту використовуючи хеш комітів може бути трохи напряжно. В справжньому гіті в тебе не буде візуалізації дерева комітів в терміналі, тому доведеться використовувати `git log` щоб подивится хеші комітів.","","Більше того, хеші як правило набагато довші в справжньому гіті. Типовий хеш виглядає як `fed2da64c0efc5293610bdd892f82a58e8cbc5d8`. Без мнемонік не обійтися)...","","З іншого боку git дуже розумно працює з хешами. Він просить вказати рівно стільки літер, скільки потрібно щоб відрізнити один коміт від іншого. Отже, замість довгого хеша зверху можна просто набрати `fed2`."]}},{type:"ModalAlert",options:{markdowns:["Як було сказано, вказувати коміти за хешем не найзручніша річ, через це git підтримує відносні посилання. Вони реально круті!","","З відносними посиланнями ти можеш почати з якогось зручного місця  (наприклад гілки `bugFix` чи посилання `HEAD`) й вказати потрібний коміт відносно цього посилання","","Відносні коміти є дуже потужним інструментом, але ми почнемо з двох простих прикладів:","","* Йдемо вверх на один коміт за допомогою `^`","* Йдемо вверх на кілька комітів за допомогою `~<число>`"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Розберемось спочатку з оператором каретки (^). Кожна каретка додана до посилання (напр. до імені коміту) вказує git що потрібно знайти батька посилання до якого застосована каретка.","",'Тож `master^` тотожнє до "перший предок посилання `master`".',"","`master^^` це дідусь (предок другого покоління) посилання `master`","","Давайте перейдемо на коміт трохи вище від master:"],afterMarkdowns:["Бум! Готово. Трохи простіше ніж набирати хеш коміту"],command:"git checkout master^",beforeCommand:"git commit"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Ти також можеш використовувати `HEAD` з відносними посиланнями. Давай використаємо це щоб трошки піднятися по дереву."],afterMarkdowns:["Просто! Ми можемо переміщуватись назад в часі з `HEAD^`"],command:"git checkout C3; git checkout HEAD^; git checkout HEAD^; git checkout HEAD^",beforeCommand:"git commit; git commit"}},{type:"ModalAlert",options:{markdowns:["Щоб пройти цей рівень перемістись на першого предка гілки `bugFix`. Ти опинишся в стані `detach HEAD`.","","Ти, звичайно, можеш вказати хеш, але натомість спробуй користуватися відносними посиланнями!"]}}]},vi:{childViews:[{type:"ModalAlert",options:{markdowns:["## Tham chiếu tương đối","","Dịch chuyển trong Git bằng cách chỉ định mã băm(hash) của commit cỏ vẻ hơi buồn tẻ. Trong đời thực thì sẽ không có mô tả git trực quan ngay bên cạnh terminal của bạn đâu, nên nếu bạn muốn nhìn mã băm của commit thì phải dùng `git log` thôi.","","Hơn nữa, mã băm thực tế thường dài hơn rất nhiều. Ví dụ, mã băm của commit được giới thiệu trong phần trước là `fed2da64c0efc5293610bdd892f82a58e8cbc5d8`. Đọc mà xoắn hết cả lưỡi...","","Được cái là Git cũng khá thông minh về mã băm. Nó chỉ yêu cầu bạn chỉ định mã băm đủ để xác định commit. Cho nên tôi có thể đơn giản chỉ cần gõ `fed2` thay vì cái chuỗi dài ngoằng phía trên."]}},{type:"ModalAlert",options:{markdowns:["Như tôi đã nói, xác định commit bằng mã băm của nó chẳng hề thuận tiện tẹo nào, đó là tại sao Git có những `tham chiếu tương đối`. Chúng rất tuyệt vời!","","Với tham chiếu tương đối, bạn có thể bắt đầu từ những nơi có thể ghi nhớ được (như là nhánh `bugFix` hoặc `HEAD`) và làm việc trên đó.","","Những commits tương đối rất mạnh mẽ, nhưng chúng tôi sẽ chỉ giới thiệu 2 loại đơn giản sau:","","* Dịch chuyển 1 commit lên trên trong 1 lần với `^`","* Dịch chuyển nhiều commit lên trên trong 1 lần với `~<số>`"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Xem thử cái dấu mũ (^) trước nào. Mỗi lần bạn nối nó với một cái tên tham chiếu, bạn đang ra lệnh cho Git tìm kiếm cha của một commit cụ thể.","",'Cho nên `master^` nghĩa là "cha đầu tiên của `master`".',"","`master^^` là ông nội (tổ tiên thế hệ 2) của `master`","","Thử nhảy sang commit trước master nào"],afterMarkdowns:["BÙUM! Đã xong. Đơn giản hơn gõ mã băm nhiều"],command:"git checkout master^",beforeCommand:"git commit"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Bạn cũng có thể dùng `HEAD` như là tham chiếu tương đối. Thử dùng nó để leo commit vài lần nào"],afterMarkdowns:["Game là dễ! Du hành ngược thời gian với `HEAD^`"],command:"git checkout C3; git checkout HEAD^; git checkout HEAD^; git checkout HEAD^",beforeCommand:"git commit; git commit"}},{type:"ModalAlert",options:{markdowns:["Để hoàn thành cấp độ này, nhảy sang cha của `bugFix`. Tức là tháo `HEAD`.","","Nếu muốn thì bạn có thể dùng mã băm, nhưng thế thì còn gì vui nữa dùng tham chiếu tương đối đi!"]}}]}}}},{}],127:[function(e,t,o){o.level={goalTreeString:'{"branches":{"master":{"target":"C6","id":"master"},"bugFix":{"target":"C0","id":"bugFix"}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"},"C2":{"parents":["C1"],"id":"C2"},"C3":{"parents":["C1"],"id":"C3"},"C4":{"parents":["C2"],"id":"C4"},"C5":{"parents":["C3"],"id":"C5"},"C6":{"parents":["C5"],"id":"C6"}},"HEAD":{"target":"C1","id":"HEAD"}}',solutionCommand:"git branch -f master C6;git checkout HEAD~1;git branch -f bugFix HEAD~1",startTree:'{"branches":{"master":{"target":"C4","id":"master"},"bugFix":{"target":"C5","id":"bugFix"}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"},"C2":{"parents":["C1"],"id":"C2"},"C3":{"parents":["C1"],"id":"C3"},"C4":{"parents":["C2"],"id":"C4"},"C5":{"parents":["C3"],"id":"C5"},"C6":{"parents":["C5"],"id":"C6"}},"HEAD":{"target":"C2","id":"HEAD"}}',hint:{en_US:"You'll need to use at least one direct reference (hash) to complete this level",fr_FR:"Vous aurez besoin d'utiliser au moins une référence directe (hash) pour compléter ce niveau.",zh_CN:"这一关至少要用到一次直接引用 (即哈希值)",zh_TW:"這一關至少要用到一次直接參考（hash）",es_AR:"Vas a necesitar usar al menos una referencia directa (hash) para completar este nivel",es_ES:"Vas a necesitar usar al menos una referencia directa (hash) para completar este nivel",pt_BR:"Você precisará usar pelo menos uma referência direta (hash) para completar este nível",gl:"Precisarás usar polo menos unha referencia directa (hash) para completar este nivel",de_DE:"Du musst mindestens einen Hash benutzen, um dieses Level zu schaffen",ja:"このレベルをクリアするには少なくとも一つの直接リファレンス（hash）を使用する必要があります",ru_RU:"Понадобится использовать как минимум одну прямую ссылку (хеш), чтобы пройти этот уровень",ko:"이번 레벨을 완료하려면 최소 한번은 직접 참조(해시)를 사용해야 합니다.",uk:"Тобі потрібно використати як мінімум одне пряме посилання (хеш) щоб пройти цей рівень",vi:"Bạn sẽ cần dùng ít nhất một tham chiếu trực tiếp (mã băm) để hoàn thành cấp độ này"},name:{en_US:"Relative Refs #2 (~)",de_DE:"Relative Referenzen #2 (~)",ja:"相対リファレンス　その２ (~)",es_AR:"Referencias relativas #2 (~)",es_ES:"Referencias relativas #2 (~)",pt_BR:"Referências relativas #2 (~)",gl:"Referencias relativas #2 (~)",fr_FR:"Références relatives #2 (~)",zh_CN:"相对引用2（~）",zh_TW:"相對引用二（~）",ru_RU:"Относительные ссылки №2",ko:"상대 참조 #2 (~)",uk:"Відносні посилання №2",vi:"Tham chiếu tương đối #2 (~)"},startDialog:{en_US:{childViews:[{type:"ModalAlert",options:{markdowns:['### The "~" operator',"","Say you want to move a lot of levels up in the commit tree. It might be tedious to type `^` several times, so Git also has the tilde (~) operator.","","","The tilde operator (optionally) takes in a trailing number that specifies the number of parents you would like to ascend. Let's see it in action"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Let's specify a number of commits back with `~`."],afterMarkdowns:["Boom! So concise -- relative refs are great."],command:"git checkout HEAD~4",beforeCommand:"git commit; git commit; git commit"}},{type:"ModalAlert",options:{markdowns:["### Branch forcing","","You're an expert on relative refs now, so let's actually *use* them for something.","","One of the most common ways I use relative refs is to move branches around. You can directly reassign a branch to a commit with the `-f` option. So something like:","","`git branch -f master HEAD~3`","","moves (by force) the master branch to three parents behind HEAD."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Let's see that previous command in action."],afterMarkdowns:["There we go! Relative refs gave us a concise way to refer to `C1` and branch forcing (`-f`) gave us a way to quickly move a branch to that location."],command:"git branch -f master HEAD~3",beforeCommand:"git commit; git commit; git commit; git checkout -b bugFix"}},{type:"ModalAlert",options:{markdowns:["Now that you have seen relative refs and branch forcing in combination, let's use them to solve the next level.","","To complete this level, move `HEAD`, `master`, and `bugFix` to their goal destinations shown."]}}]},es_AR:{childViews:[{type:"ModalAlert",options:{markdowns:['### El operador "~"',"","Digamos que querés moverte un montón de niveles atrás en tu árbol de commits. Podría ser tedioso tipear `^` muchas veces, por lo que git tiene el operador ~.","","","El operador ~ (opcionalmente) toma una cantidad que especifica la cantidad de padres que querés volver hacia atrás. Veámoslo en acción"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Especifiquemos una cantidad de commits hacia atrás con `~`."],afterMarkdowns:["¡Boom! Bien conciso -- las referencias relativas la rompen."],command:"git checkout HEAD~4",beforeCommand:"git commit; git commit; git commit"}},{type:"ModalAlert",options:{markdowns:["### Forzando los branches","","Ahora que sos un experto en las referencias relativas, *usémoslas* para algo.","","Una de las formas más comunes en que uso las referencias relativas es para mover las ramas. Podés reasignar directamente una rama a un commit usando la opción `-f`. Así que algo como:","","`git branch -f master HEAD~3`","","Mueve (forzadamente) la rama master tres padres atrás de HEAD."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Veamos ese comando previo en acción"],afterMarkdowns:["¡Ahí vamos! Las referencias relativas nos dieron una manera concisa de referenciar a `C1`, y forzar la rama (`-f`) nos dio una manera rápida de mover la rama a esa ubicación"],command:"git branch -f master HEAD~3",beforeCommand:"git commit; git commit; git commit; git checkout -b bugFix"}},{type:"ModalAlert",options:{markdowns:["Ahora que viste las referencias relativas y el forzar ramas combinados, usémoslos para resolver el siguiente nivel.","","Para completar este nivel, mové `HEAD`, `master` y `bugFix` a sus destinos finales."]}}]},es_ES:{childViews:[{type:"ModalAlert",options:{markdowns:['### El operador "~"',"","Digamos que quieres moverte un montón de niveles atrás en tu árbol de commits. Podría ser tedioso escribir `^` muchas veces, por lo que git tiene el operador ~.","","","El operador ~ (opcionalmente) toma una cantidad que especifica la cantidad de padres que quieres volver hacia atrás. Veámoslo en acción"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Especifiquemos una cantidad de commits hacia atrás con `~`."],afterMarkdowns:["¡Zas! Bien conciso -- las referencias relativas la rompen."],command:"git checkout HEAD~4",beforeCommand:"git commit; git commit; git commit"}},{type:"ModalAlert",options:{markdowns:["### Forzando las ramas","","Ahora que eres un experto en las referencias relativas, *usémoslas* para algo.","","Una de las formas más comunes en que uso las referencias relativas es para mover las ramas. Puedes reasignar directamente una rama a un commit usando la opción `-f`. Algo así como:","","`git branch -f master HEAD~3`","","Mueve (forzadamente) la rama master tres padres por detrás de HEAD."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Veamos ese comando previo en acción"],afterMarkdowns:["¡Allá vamos! Las referencias relativas nos proporcionaron una manera concisa de referenciar a `C1`, y forzar la rama (`-f`) nos dio una manera rápida de mover la rama a esa ubicación"],command:"git branch -f master HEAD~3",beforeCommand:"git commit; git commit; git commit; git checkout -b bugFix"}},{type:"ModalAlert",options:{markdowns:["Ahora que viste las referencias relativas y el forzar ramas combinados, usémoslos para resolver el siguiente nivel.","","Para completar este nivel, mueve `HEAD`, `master` y `bugFix` a sus destinos finales."]}}]},pt_BR:{childViews:[{type:"ModalAlert",options:{markdowns:['### O operador "~"',"","Digamos que você queira se mover vários níveis para cima na árvore de commits. Pode ser entediante digitar `^` várias vezes, e por isso o Git possui também o operador til (`~`).","","","Um número pode ser passado (opcionalmente) após o operador til, especificando o número de ancestrais que você deseja subir. Vamos vê-lo em ação"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Vamos especificar um número de commits para trás com `~`."],afterMarkdowns:["Boom! Tão conciso -- referências relativas são incríveis."],command:"git checkout HEAD~4",beforeCommand:"git commit; git commit; git commit"}},{type:"ModalAlert",options:{markdowns:["### Forçando os ramos","","Agora que você é um especialista em referências relativas, vamos *usá-las* de fato para alguma coisa.","","Uma das situações mais comuns na qual eu uso referências relativas é quando quero trocar ramos de lugar. Você pode redefinir diretamente o commit para o qual um ramo aponta com a opção `-f`. Desta forma, o seguinte comando:","","`git branch -f master HEAD~3`","","Move (à força) o ramo master 3 ancestrais acima do HEAD."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Vejamos o comando anterior em ação"],afterMarkdowns:["Aqui vamos nós! As referências relativas nos deram uma forma concisa de nos referirmos ao `C1`, e a movimentação de ramos (com `-f`) nos deu uma forma de apontar rapidamente um ramo para esse local"],command:"git branch -f master HEAD~3",beforeCommand:"git commit; git commit; git commit; git checkout -b bugFix"}},{type:"ModalAlert",options:{markdowns:["Agora que você viu referências relativas e movimentação de ramos combinadas, vamos usá-las para resolver o próximo nível.","","Para completar este nível, mova o `HEAD` e os ramos `master` e `bugFix` para os destinos mostrados no objetivo."]}}]},gl:{childViews:[{type:"ModalAlert",options:{markdowns:['### O operador "~"',"","Digamos que queres moverte un montón de commits cara atrás nunha árbore de git. Sería moi tedioso escribir `^` moitas veces, e por iso que git tamén ten o operador (`~`).","","","Pódeselle pasar un número (opcionalmente) despois da tilde, especificando o número de commits que se quere mover cara atrás. Mira como é en acción."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Imos especificar un número de commits cara atrás con `~`."],afterMarkdowns:["¡Veeeña! Ben apuntado -- as referencias relativas son a leche."],command:"git checkout HEAD~4",beforeCommand:"git commit; git commit; git commit"}},{type:"ModalAlert",options:{markdowns:["### Forzando as ramas","","Agora que eres un especialista en referencias relativas, imos *usalas* para algunha cousiña.","","Un dos usos máis comúns para o uso das referencias relativas é para movelas ramas de lugar. Ti podes reasignar directamente unha rama a un commit usando a opción `-f`. Así que con algo coma:","","`git branch -f master HEAD~3`","","Move (de forma forzosa) a rama master 3 commits enriba do HEAD."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Vexamos o comando anterior en acción"],afterMarkdowns:["¡Agora é o a nosa quenda! As referencias relativas nos darán unha forma concisa de nos referír a `C1`, e forzar a rama (con `-f`) deunos unha forma rápida de movela rama `master` a esa posición."],command:"git branch -f master HEAD~3",beforeCommand:"git commit; git commit; git commit; git checkout -b bugFix"}},{type:"ModalAlert",options:{markdowns:["Xa viches as referencias relativas e o movemento de ramas combinadas, ímolas usar para resolver o próximo exercicio.","","Para completar este nivel, mova o `HEAD` e as ramas `master` e `bugFix` para os destinos mostrados no obxectivo."]}}]},fr_FR:{childViews:[{type:"ModalAlert",options:{markdowns:['### L\'opérateur "~"',"","Disons que vous souhaitez remonter beaucoup de niveaux dans l'arbre des commits. Cela peut être ennuyeux d'utiliser `^` plusieurs fois, ainsi Git a aussi l'opérateur tilde (~).","","","L'opérateur tilde prend optionnellement à sa suite un nombre qui spécifie le nombre de parents que vous souhaitez remonter. Voyons cela en action"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Spécifions le nombre de commits en arrière avec `~`."],afterMarkdowns:["Boum ! Tellement rapide ! Les références relatives sont géniales."],command:"git checkout HEAD~4",beforeCommand:"git commit; git commit; git commit"}},{type:"ModalAlert",options:{markdowns:["### Forcer les branches","","Vous êtes maintenant un expert des références relatives, alors servons-nous en.","","L'une des principales façons dont j'utilise les références relatives est pour réorganiser les branches. Vous pouvez directement réassigner les branches à un commit avec l'option `-f`. Ainsi quelque chose comme :","","`git branch -f master HEAD~3`","","bouge (de force) la branche master à trois parents derrière HEAD."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Voyons l'effet de la précédente commande"],afterMarkdowns:["On y est ! Les références relatives nous donnent une méthode concise pour référencer `C1` et le forçage de branche (`-f`) nous donne une méthode rapide pour bouger une branche à cet emplacement."],command:"git branch -f master HEAD~3",beforeCommand:"git commit; git commit; git commit; git checkout -b bugFix"}},{type:"ModalAlert",options:{markdowns:["Maintenant que vous avez vu les références relatives et le forçage de branche, utilisons-les pour résoudre le niveau suivant.","","Pour compléter ce niveau, bouger `HEAD`, `master`, et `bugFix` à leurs destinations désignées."]}}]},de_DE:{childViews:[{type:"ModalAlert",options:{markdowns:['### Der "~"-Operator',"","Nehmen wir an du willst viele Schritte im Commit-Baum zurückgehen. Dann wird es schnell mühsam immer wieder `^` einzugeben; deswegen gibt es in Git den Tilde-Operator `~`.","","Der Tilde-Operator akzeptiert optional eine Zahl, mit der du angeben kannst, wieviele Vorgänger du zurückgehen willst. Keine Anzahl anzugeben, bewirkt dasselbe wie `~1`."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Geben wir mit `~` an wieviele Commits wir zurückgehen wollen"],afterMarkdowns:["Peng! So einfach -- relative Referenzen sind super."],command:"git checkout HEAD~4",beforeCommand:"git commit; git commit; git commit"}},{type:"ModalAlert",options:{markdowns:["### Erzwungene Branches","","Du bist jetzt Experte in Sachen relative Referenzen, also lass sie uns mal richtig einsetzen.","","Das Verschieben von Branches ist einer der häufigsten Anwendungsfälle dafür. Du kannst einen Branchnamen direkt auf einen bestimmten Commit setzen (_ohne_ ihn vorher ausgecheckt haben zu müssen!) indem du den Parameter `-f` benutzt. So in etwa:","","`git branch -f master HEAD~3`","","Das bewegt (erzwungenermaßen) den `master` auf den Commit drei Vorgänger vor `HEAD`."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Schauen wir uns das mal in Aktion an:"],afterMarkdowns:["Das war's schon! Relative Referenzen ermöglichen es uns den Commit `C1` sehr einfach anzugeben und `git branch -f` ermöglicht es uns, den Branch sehr schnell auf diesen Commit zu setzen."],command:"git branch -f master HEAD~3",beforeCommand:"git commit; git commit; git commit; git checkout -b bugFix"}},{type:"ModalAlert",options:{markdowns:["Jetzt wo du relative Referenzen und erzwungenes Branching in Kombination gesehen hast können wir damit den nächsten Level bewältigen.","","Bewege `HEAD`, `master` und `bugFix` an die jeweils angegebenen Positionen, um diesen Level abzuschließen."]}}]},zh_CN:{childViews:[{type:"ModalAlert",options:{markdowns:["### “~”操作符","","如果你想在提交树中向上移动很多步的话，敲那么多 `^` 貌似也挺烦人的，Git 当然也考虑到了这一点，于是又引入了操作符 `~`。","","","该操作符后面可以跟一个数字（可选，不跟数字时与 `^` 相同，向上移动一次），指定向上移动多少次。咱们还是通过实际操作看一下吧"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["咱们用 `~<num>` 一次后退四步。"],afterMarkdowns:["多么的简洁 —— 相对引用就是方便啊！"],command:"git checkout HEAD~4",beforeCommand:"git commit; git commit; git commit"}},{type:"ModalAlert",options:{markdowns:["### 强制修改分支位置","","你现在是相对引用的专家了，现在用它来做点实际事情。","","我使用相对引用最多的就是移动分支。可以直接使用 `-f` 选项让分支指向另一个提交。例如:","","`git branch -f master HEAD~3`","","上面的命令会将 master 分支强制指向 HEAD 的第 3 级父提交。"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["现在咱们来演示一下刚才的命令："],afterMarkdowns:["这就对了! 相对引用为我们提供了一种简洁的引用提交记录 `C1` 的方式， 而 `-f` 则容许我们将分支强制移动到那个位置。"],command:"git branch -f master HEAD~3",beforeCommand:"git commit; git commit; git commit; git checkout -b bugFix"}},{type:"ModalAlert",options:{markdowns:["既然你已经看过相对引用与强制移动分支的演示了，那么赶快使用这些技巧来挑战这一关吧！","","要完成此关，移动 `HEAD`，`master` 和 `bugFix` 到目标所示的位置。"]}}]},zh_TW:{childViews:[{type:"ModalAlert",options:{markdowns:['### "~" 符號',"","假設需要在 commit tree 中向上移動多個 commit。使用太多 `^` 會非常討人厭，所以 Git 也加入了波浪（~）符號。","","","波浪符號後面可以選擇一個數字（你也可以不選擇），該數字可以告訴 Git 我要向上移動多少個 commit 。舉個例子"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["使用 `~` 一次往上移動多個 commit。"],afterMarkdowns:["哇！太簡潔了 -- 相對引用真的很好用！"],command:"git checkout HEAD~4",beforeCommand:"git commit; git commit; git commit"}},{type:"ModalAlert",options:{markdowns:["### Branch forcing","","你現在是相對引用的高手了，現在用它來實際做點事情。","","我使用相對引用最多的就是移動分支。你可以使用 `-f` 選項直接讓分支指向另一個 commit。舉個例子:","","`git branch -f master HEAD~3`","","（強制）移動 master 指向從 HEAD 往上數的第三個 parent commit。"]}},{type:"ModalAlert",options:{markdowns:["要完成這一關，移動 `HEAD`，`master` 和 `bugFix` 到目標所示的位置。"]}}]},ja:{childViews:[{type:"ModalAlert",options:{markdowns:['###"~" 演算子',"","コミットツリーの中で複数の段階上へ移動したいとします。毎回毎回`^`と打つのは面倒くさくなるかもしれませんので、gitにはチルダの演算子も備わっています。","","","チルダ演算子のあとには、上へ移動したい親コミットの数を表す数字もオプションでつけられます。実際の動作を見てみましょう。"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["遡る前のコミット数を`~`で指定しましょう。"],afterMarkdowns:["よっしゃ！効率が良いですね -- 相対リファレンスはなんと便利です。"],command:"git checkout HEAD~4",beforeCommand:"git commit; git commit; git commit"}},{type:"ModalAlert",options:{markdowns:["###ブランチの強制","","今はあなたも相対リファレンスの達人なので、実践的な使い方を覚えましょう。","","相対リファレンスのよくある使い方としてあるのは、ブランチの移動です。`-f`オプションを使ってブランチを直接コミットに関連付けられます。次のようになります","","`git branch -f master HEAD~3`","","masterブランチを（強制的に）HEADより親三代前へと移動します。"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["先ほどのコマンドの動作を見てみましょう。"],afterMarkdowns:["できました！相対リファレンスを使うことで、手短く`C1`を指定することができ、`-f`でブランチを強制的にそこへ移動することができました。"],command:"git branch -f master HEAD~3",beforeCommand:"git commit; git commit; git commit; git checkout -b bugFix"}},{type:"ModalAlert",options:{markdowns:["相対リファレンスとブランチの強制関連付けを見ましたので、いまここでそれらの方法を使ってみましょう。","","このレベルをクリアするには`HEAD`、`master`、`bugFix`をゴールで指定されている目的位置まで移動してください。"]}}]},ru_RU:{childViews:[{type:"ModalAlert",options:{markdowns:['### Оператор "~"',"","Предположим, нужно переместиться на много шагов назад по дереву. Было бы неудобно печатать `^` несколько раз (или несколько десятков раз), так что Git поддерживает также оператор тильда (~).","","","К тильде (опционально) можно добавить количество родительских коммитов, через которые нужно пройти. Посмотрим, как это работает."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Укажем после `~` число коммитов, через которые надо пройти."],afterMarkdowns:["Оп! Очевидно, относительные ссылки прекрасны."],command:"git checkout HEAD~4",beforeCommand:"git commit; git commit; git commit"}},{type:"ModalAlert",options:{markdowns:["### Перемещение ветки (branch forcing)","","Теперь мы разбираемся в относительных ссылках, так что можно реально использовать их для дела.","","Одна из наиболее распространённых целей, для которых используются относительные ссылки - это перемещение веток. Можно напрямую прикрепить ветку к коммиту при помощи опции `-f`. Например, команда:","","`git branch -f master HEAD~3`","","Переместит (принудительно) ветку `master` на три родителя назад от `HEAD`."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Посмотрим, как работает эта команда"],afterMarkdowns:["Вуаля! Относительная ссылка дала нам возможность просто сослаться на `C1`, а branch forcing (`-f`) позволил быстро переместить указатель ветки на этот коммит."],command:"git branch -f master HEAD~3",beforeCommand:"git commit; git commit; git commit; git checkout -b bugFix"}},{type:"ModalAlert",options:{markdowns:["Мы рассмотрели относительные ссылки и branch forcing вкупе, так что теперь пришло время пройти следующий уровень.","","Чтобы пройти этот уровень, передвинь `HEAD`, `master` и `bugFix` так, как показано на визуализации."]}}]},ko:{childViews:[{type:"ModalAlert",options:{markdowns:['### "~" 연산자',"","커밋트리에서 위로 여러 단계를 올라가고 싶을 수 있습니다. `^`를 계속 입력해서 올라가는것 말고 좋은 방법이 있습니다. Git 에는 틸드 (~) 연산자가 있습니다.","",""," (~) 틸드 연산자는 (선택적) 올라가고 싶은 부모의 갯수가 뒤에 숫자가 옵니다. 직접 확인해 보죠."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["돌아가고 싶은 커밋의 갯수를 `~`뒤의 숫자로 명시해 줍시다."],afterMarkdowns:["Boom! 아주 간결합니다. -- 상대 참조는 대단해요."],command:"git checkout HEAD~4",beforeCommand:"git commit; git commit; git commit"}},{type:"ModalAlert",options:{markdowns:["### 브랜치 강제로 옮기기","","이제 여러분은 상대 참조의 전문가 입니다. 이제 이걸로 무언가를 해봅시다.","","제가 상대 참조를 사용하는 가장 일반적인 방법은 브랜치를 옮길 때 입니다. `-f` 옵션을 이용해서 브랜치를 특정 커밋에 직접적으로 재지정 할 수 있습니다. 이런 식으로 말이죠:","","`git branch -f master HEAD~3`","","(강제로) master 브랜치를 HEAD에서 세번 뒤로 옮겼습니다. (three parents behind HEAD)."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["방금의 커맨드를 직접 확인해 봅시다."],afterMarkdowns:["됬네요! 우리는 상대 참조를 통해 `C1`을 간결한 방법으로 참조할 수 있었고 브랜치 강제(`-f`)를 통해 브랜치를 저 위치로 빠르게 옮길 수 있었습니다."],command:"git branch -f master HEAD~3",beforeCommand:"git commit; git commit; git commit; git checkout -b bugFix"}},{type:"ModalAlert",options:{markdowns:["자 이제 상대 참조와 브랜치 강제의 조합을 봤으니 다음 레벨을 해결해 봅시다.","","이 레벨을 통과하기 위해서, `HEAD`와 `master`와 `bugFix`를 제시되는 골지점으로 옮겨 주십시오."]}}]},uk:{childViews:[{type:"ModalAlert",options:{markdowns:['### Оператор "~"',"","Уявімо, що тобі потрібно піднятися досить високо вгору в дереві комітів. Було б трохи напряжно набирати `^` багато разів, тому Git також має оператор тильда(~).","","","До оператор тильда (не обов’язково) можна дописати справа число, що вказує на яку кількість предків потрібно піднятися вверх. Подивимось на практиці"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Давайте вкажемо на яку кількість комітів повернутися з `~`."],afterMarkdowns:["Ка-бум! Так коротко -- відносні посилання прекрасні."],command:"git checkout HEAD~4",beforeCommand:"git commit; git commit; git commit"}},{type:"ModalAlert",options:{markdowns:["### Форсуємо гілку","","Тепер ти експерт в відносних посиланнях, давай же *використаємо* їх для справи.","","Один з найуживаніших прийомів де я використовую відносні посилання це переміщення гілок. Ти можеш напряму переспрямувати бранч на якийсь коміт використавши опцію `-f` (force, тобто насильно). Щось на зразок:","","`git branch -f master HEAD~3`","","Переміщує (насильно) гілку master на три предки позад HEAD."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Давайте подивимось на попередню команду в дії"],afterMarkdowns:["Ось і маєш! Відносні посилання дають нам зручний спосіб доступу до коміту`C1` крім того форсування бранчів (`-f`) дає нам можливість швидко перемістити гілку на цей коміт"],command:"git branch -f master HEAD~3",beforeCommand:"git commit; git commit; git commit; git checkout -b bugFix"}},{type:"ModalAlert",options:{markdowns:["Тепер, коли ти побачив відносні посилання та форсування гілок в купі, давай використаємо це щоб пройти поточний рівень.","","Щоб пройти цей рівень, перемісти `HEAD`, `master` та `bugFix` так як показано в візуалізації."]}}]},vi:{childViews:[{type:"ModalAlert",options:{markdowns:['### Toán tử "~"',"","Giả sử bạn muốn leo lên nhiều cấp trong git. Dùng `^` vài lần thì tù lắm, nên Git đã có dấu ngã (~) cho việc đó.","","","Theo sau toán tử ngã (~) là số lượng cha ông mà bạn muốn leo lên(không bắt buộc). Xem thử làm thật thì thế nào nào"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Hãy chỉ định số lượng commit với `~`."],afterMarkdowns:["BÙUM! Quá chuẩn luôn -- tham chiếu tương đối tuyệt vời."],command:"git checkout HEAD~4",beforeCommand:"git commit; git commit; git commit"}},{type:"ModalAlert",options:{markdowns:["### Branch forcing","","Giờ thì bạn là cao thủ về tham chiếu tương đối rồi, *làm* thật thôi chứ nhỉ.","","Tôi thì hay thường dùng tham chiếu tương đối để dịch chuyển nhánh. Bạn có thể trực tiếp gán lại nhánh cho commit với cú pháp `-f`. Kiểu như thế này:","","`git branch -f master HEAD~3`","","dịch chuyển (ép buộc) nhánh master lên 3 commit phía trên HEAD."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Xem thử cái lệnh trên hoạt động sao nào."],afterMarkdowns:["Đóóóó! Tham chiếu tương đối cho chúng ta một cách chuẩn xác để trỏ tới `C1` và ép nhánh bằng (`-f`) thì dịch chuyển nhanh chóng nhánh tới đó."],command:"git branch -f master HEAD~3",beforeCommand:"git commit; git commit; git commit; git checkout -b bugFix"}},{type:"ModalAlert",options:{markdowns:["Giờ thì bạn đã thấy cách kết hợp tham chiếu tương đối và ép nhánh, dùng chúng để vượt level tiếp thôi.","","Để hoàn thành cấp độ này, chuyển `HEAD`, `master`, và `bugFix` đến mục tiêu được xác định của chúng."]}}]}}}},{}],128:[function(e,t,o){o.level={goalTreeString:"%7B%22branches%22%3A%7B%22master%22%3A%7B%22target%22%3A%22C1%22%2C%22id%22%3A%22master%22%7D%2C%22pushed%22%3A%7B%22target%22%3A%22C2%27%22%2C%22id%22%3A%22pushed%22%7D%2C%22local%22%3A%7B%22target%22%3A%22C1%22%2C%22id%22%3A%22local%22%7D%7D%2C%22commits%22%3A%7B%22C0%22%3A%7B%22parents%22%3A%5B%5D%2C%22id%22%3A%22C0%22%2C%22rootCommit%22%3Atrue%7D%2C%22C1%22%3A%7B%22parents%22%3A%5B%22C0%22%5D%2C%22id%22%3A%22C1%22%7D%2C%22C2%22%3A%7B%22parents%22%3A%5B%22C1%22%5D%2C%22id%22%3A%22C2%22%7D%2C%22C3%22%3A%7B%22parents%22%3A%5B%22C1%22%5D%2C%22id%22%3A%22C3%22%7D%2C%22C2%27%22%3A%7B%22parents%22%3A%5B%22C2%22%5D%2C%22id%22%3A%22C2%27%22%7D%7D%2C%22HEAD%22%3A%7B%22target%22%3A%22pushed%22%2C%22id%22%3A%22HEAD%22%7D%7D",solutionCommand:"git reset HEAD~1;git checkout pushed;git revert HEAD",compareOnlyBranches:!0,startTree:'{"branches":{"master":{"target":"C1","id":"master"},"pushed":{"target":"C2","id":"pushed"},"local":{"target":"C3","id":"local"}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"},"C2":{"parents":["C1"],"id":"C2"},"C3":{"parents":["C1"],"id":"C3"}},"HEAD":{"target":"local","id":"HEAD"}}',name:{en_US:"Reversing Changes in Git",de_DE:"Änderungen in Git rückgängig machen",ja:"変更を元に戻す",fr_FR:"Annuler des changements avec Git",es_AR:"Revirtiendo cambios en git",es_ES:"Revirtiendo cambios en git",pt_BR:"Revertendo mudanças no Git",gl:"Revertindo cambios en git",ko:"Git에서 작업 되돌리기",zh_CN:"撤销变更",zh_TW:"在 git 中取消修改 ",ru_RU:"Отмена изменений в Git",uk:"Відміна змін в Git",vi:"Hoàn tác thay đổi trong Git"},hint:{en_US:"Notice that revert and reset take different arguments.",de_DE:"Beachte, dass revert und reset unterschiedliche Argumente benötigen",fr_FR:"Notez que `revert` et `reset` n'ont pas les mêmes arguments.",es_AR:"Notá que revert y reset toman parámetros distintos",es_ES:"Observa que revert y reset utilizan parámetros distintos",pt_BR:"Lembre que revert e reset recebem parâmetros diferentes",gl:"Lembra que revert e reset usan parámetros distintos",zh_CN:"注意 revert 和 reset 使用的参数不同。",zh_TW:"注意 revert 和 reset 使用不同的參數。",ko:"revert와 reset이 받는 인자가 다름을 기억하세요",ja:"revertとresetとで引数が異なることに注意。",ru_RU:"Обрати внимание, что revert и reset принимают разные параметры.",uk:"Зверни увагу на те що revert та reset приймають різні параметри",vi:"Lưu ý rằng hoàn tác(revert) và đặt lại(reset) có những đối số khác nhau."},startDialog:{en_US:{childViews:[{type:"ModalAlert",options:{markdowns:["## Reversing Changes in Git","","There are many ways to reverse changes in Git. And just like committing, reversing changes in Git has both a low-level component (staging individual files or chunks) and a high-level component (how the changes are actually reversed). Our application will focus on the latter.","","There are two primary ways to undo changes in Git -- one is using `git reset` and the other is using `git revert`. We will look at each of these in the next dialog",""]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["## Git Reset","",'`git reset` reverts changes by moving a branch reference backwards in time to an older commit. In this sense you can think of it as "rewriting history;" `git reset` will move a branch backwards as if the commit had never been made in the first place.',"","Let's see what that looks like:"],afterMarkdowns:["Nice! Git moved the master branch reference back to `C1`; now our local repository is in a state as if `C2` had never happened."],command:"git reset HEAD~1",beforeCommand:"git commit"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["## Git Revert","",'While resetting works great for local branches on your own machine, its method of "rewriting history" doesn\'t work for remote branches that others are using.',"","In order to reverse changes and *share* those reversed changes with others, we need to use `git revert`. Let's see it in action"],afterMarkdowns:["Weird, a new commit plopped down below the commit we wanted to reverse. That's because this new commit `C2'` introduces *changes* -- it just happens to introduce changes that exactly reverses the commit of `C2`.","","With reverting, you can push out your changes to share with others."],command:"git revert HEAD",beforeCommand:"git commit"}},{type:"ModalAlert",options:{markdowns:["To complete this level, reverse the most recent commit on both `local` and `pushed`. You will revert two commits total (one per branch).","","Keep in mind that `pushed` is a remote branch and `local` is a local branch -- that should help you choose your methods."]}}]},es_AR:{childViews:[{type:"ModalAlert",options:{markdowns:["## Revirtiendo cambios en git","","Hay varias maneras de revertir cambios en git. Y, tal como al commitear, revertir cambios en git tiene tanto un componente de bajo nivel (indexar archivos o fragmentos individualmente) como un componente de alto nivel (cómo son efectivamente revertidos los cambios). Nuestra aplicación se va a concentrar en esto último.","","Hay dos formas principales de deshacer cambios en git -- uno es usando `git reset` y el otro es usando `git revert`. Vamos a ver cada uno de esos a continuación",""]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["## Git Reset","",'`git reset` revierte los cambios moviendo la referencia de una rama hacia atrás en el tiempo a un commit anterior. En este sentido podés pensarlo como "reescribir la historia". `git reset` va a mover la rama hacia atrás, como si el commit nunca se hubiera hecho.',"","Veamos cómo es eso:"],afterMarkdowns:["¡Genial! git simplemente movió la referencia de la rama master atrás hacia `C1`. Ahora tu repositorio local está en un estado como si `C2` nunca hubiera ocurrido"],command:"git reset HEAD~1",beforeCommand:"git commit"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["## Git Revert","",'Mientras que resetear los cambios funciona genial para ramas locales en tu máquina, su método de "reescribir la historia" no funciona para ramas remotas que otros están usando.',"","Para revertir cambios y *compartir* esa _revertida_ con otros, necesitamos usar `git revert`. Veámoslo en acción"],afterMarkdowns:["Extraño. Hay un nuevo commit aplicado sobre el que queríamos revertir. Eso es porque este nuevo commit `C2'` introduce *cambios* - sólo que esos cambios son exactamente los necesarios para revertir los que introdujo `C2`.","","Cuando usás revert, podés pushear ese cambio para compartirlo con otros."],command:"git revert HEAD",beforeCommand:"git commit"}},{type:"ModalAlert",options:{markdowns:["Para completar este nivel, revertí los dos commits más recientes, tanto en `local` como en `pushed`.","","Tené en cuenta que `pushed` es una rama remota y `local` es una rama local -- eso debería ayudarte a elegir qué métodos usar."]}}]},es_ES:{childViews:[{type:"ModalAlert",options:{markdowns:["## Revirtiendo cambios en git","","Hay varias maneras de revertir cambios en git. Y, tal como al commitear, revertir cambios en git tiene tanto un componente de bajo nivel (indexar archivos o fragmentos individualmente) como un componente de alto nivel (cómo son efectivamente revertidos los cambios). Nuestra aplicación se va a concentrar en esto último.","","Hay dos formas principales de deshacer cambios en git -- uno es usando `git reset` y el otro es usando `git revert`. Vamos a ver cada uno de ellos a continuación",""]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["## Git Reset","",'`git reset` deshace los cambios moviendo la referencia de una rama hacia atrás en el tiempo a un commit anterior. En este sentido puedes imaginarlo como "reescribir la historia". `git reset` va a mover la rama hacia atrás, como si el commit nunca se hubiera hecho.',"","Veamos cómo es eso:"],afterMarkdowns:["¡Genial! git simplemente movió la referencia de la rama master atrás hacia `C1`. Ahora tu repositorio local está en un estado como si `C2` nunca hubiera ocurrido"],command:"git reset HEAD~1",beforeCommand:"git commit"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["## Git Revert","",'Mientras que resetear los cambios funciona estupendamente para ramas locales en tu máquina, su método de "reescribir la historia" no funciona para ramas remotas que otros están usando.',"","Para revertir cambios y *compartir* esa _revertida_ con otros, necesitamos usar `git revert`. Veámoslo en acción"],afterMarkdowns:["Extraño. Hay un nuevo commit aplicado sobre el que queríamos revertir. Eso es porque este nuevo commit `C2'` introduce *cambios* - sólo que esos cambios son exactamente los necesarios para revertir los que introdujo `C2`.","","Cuando utilices revert, puedes hacer push sobre ese cambio para compartirlo con otros."],command:"git revert HEAD",beforeCommand:"git commit"}},{type:"ModalAlert",options:{markdowns:["Para completar este nivel, deshaz los dos commits más recientes, tanto en `local` como en `pushed`.","","Ten en cuenta que `pushed` es una rama remota y `local` es una rama local -- eso debería ayudarte a elegir qué métodos usar."]}}]},pt_BR:{childViews:[{type:"ModalAlert",options:{markdowns:["## Revertendo Mudanças no Git","","Existem várias maneiras de reverter mudanças no Git. E assim como o ato de commitar, reverter mudanças no Git também tem um componente de baixo nível (a preparação, ou staging, de arquivos ou trechos de arquivos individuais) e um componente de alto nível (como as mudanças são, de fato, revertidas). Aqui vamos focar neste último ponto.","","Há duas maneiras principais de desfazer mudanças no Git -- uma delas é usando `git reset`, e a outra é usando `git revert`. Vamos olhar cada uma delas na próxima janela",""]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["## Git Reset","",'O comando `git reset` reverte mudanças movendo para trás no tempo (para um commit mais antigo) a referência do ramo. Desta forma, você pode pensar nessa operação como uma "reescrita do histórico"; o `git reset` vai mover o ramo para trás como se o commit nunca tivesse existido.',"","Vejamos como funciona:"],afterMarkdowns:["Legal! O Git simplesmente moveu a referência do ramo master de volta para `C1`; agora o nosso repositório local está em um estado como se o `C2` nunca tivesse acontecido"],command:"git reset HEAD~1",beforeCommand:"git commit"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["## Git Revert","",'Embora o reset funcione muito bem em ramos locais no seu próprio computador, o método utilizado de "reescrever o histórico" não funciona com ramos remotos que outras pessoas estejam usando.',"","Para reverter mudanças e conseguir *compartilhar* essas mudanças com os outros, precisamos usar o `git revert`. Vejamo-lo em ação"],afterMarkdowns:["Estranho, um novo commit surgiu abaixo do commit que queríamos reverter. Isso é porque o novo commit `C2'` introduz *mudanças* -- acontece que as mudanças que ele introduz revertem exatamente aquelas do commit `C2`.","","Com o `revert`, você pode fazer `push` das suas mudanças para compartilhá-las com os outros."],command:"git revert HEAD",beforeCommand:"git commit"}},{type:"ModalAlert",options:{markdowns:["Para completar este nível, reverta os dois commits mais recentes tanto em `local` como em `pushed`.","","Tenha em mente que `pushed` é um ramo remoto, e `local` é um ramo local -- isso deve ajudá-lo a escolher o método apropriado."]}}]},gl:{childViews:[{type:"ModalAlert",options:{markdowns:["## Revertindo cambios en Git","","Existen varias formas de revertir os cambios en git. E, como cando se fai commit, desfacer cambios supon unha operación de baixo nivel (a indexación de arquivos ou trozos de eles) e unha operación de alto nivel (desfacer os cambios xa aplicados). Aquí ímonos enfocar neste último punto.","","Hai dúas formas de desfacer os cambios en git -- unha delas é `git reset`, e a outra é usando `git revert`. Imos comparalas na próxima ventá.",""]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["## Git Reset","",'O comando `git reset` desfai os cambios movendo a referencia dunha rama cara un commit máis antigo na rama. Desta forma, podes pensar nesta operación como "reescritura do histórico"; o `git reset` vai movela rama cara atrás, como se ós commits nunca antes se fixeran.',"","Vexamos o seu funcionamento:"],afterMarkdowns:["¡Bye bye! Git moveu a referencia da rama master cara atrás, ata o commit `C1`; agora o teu repositorio local está coma se o commit `C2` nunca acontecera."],command:"git reset HEAD~1",beforeCommand:"git commit"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["## Git Revert","",'Mentres que resetear os cambios funciona xenial para as ramas locales na túa máquina, o método utilizado de "reescribir o histórico" non funciona con ramas remotas que outra xente usa.',"","Para revervir os cambios e *compartir* eses cambios ca outra xente, precisamos usar `git revert`. Atende a cómo funciona"],afterMarkdowns:["Estrano, xurdíu un novo commit por baixo do commit que queriamos desfacer. Iso é porque o novo commit `C2'` engadíu *cambios* -- o que pasa é que o commit desfai exactamente os cambios feitos no commit `C2`.","","Con `revert`, ti podes facer `push` dos teus cambios para compartilos cos outros."],command:"git revert HEAD",beforeCommand:"git commit"}},{type:"ModalAlert",options:{markdowns:["Para completar este nivel, reverte os dous commits máis recentes tanto en `local` como en `pushed`.","","Ten en mente que `pushed` é unha rama remota, e `local` é unha rama local -- Iso poida que te axude a aplicar o método apropriado."]}}]},de_DE:{childViews:[{type:"ModalAlert",options:{markdowns:["## Änderungen in Git rückgängig machen","","Es gibt viele Möglichkeiten, Änderungen in Git zurückzunehmen. Und ebenso wie das Committen hat auch das rückgängig Machen eine Basis-Komponente (Dateien und Inhalte vormerken) und einen übergeordneten Aspekt (wie die Änderungen tatsächlich zurückgenommen werden). Diese Applikation beschäftigt sich wiederum mit den übergeordneten Vorgängen.","","Es gibt grundsätzlich zwei Arten in Git etwas rückgängig zu machen -- einerseits `git reset` und andererseit `git revert`. Wir schauen uns beide mal an.",""]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["## Git Reset","",'`git reset` nimm Änderungen zurück, indem es eine Branch-Referenz auf einen anderen Commit setzt. Es ist ein bisschen (aber nicht wirklich) wie "Geschichte umschreiben"; `git reset` bewegt einen Branch auf einen anderen Commit, als hätte er nie anders ausgesehen.',"","Schauen wir, wie das aussieht:"],afterMarkdowns:["Schick! Git hat den `master` einfach auf `C1` gesetzt; unser lokales Repository sieht nun so aus, als hätte `C2` nie stattgefunden."],command:"git reset HEAD~1",beforeCommand:"git commit"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["## Git Revert","",'Obwohl `git reset` super im lokalen Kontext funktioniert, ist der Ansatz vom "Umschreiben" der Commit-Geschichte nicht geeignet für Branches, die auf einem Server liegen und auch von anderen benutzt werden.',"","Um Änderungen rückgängig zu machen und das mit anderen zu *teilen* müssen wir `git revert` benutzen. Schauen wir uns das in Aktion an."],afterMarkdowns:["Komisch, es ist ein neuer Commit entstanden. Das liegt daran, dass `C2'` genau die *Änderungen* enthält, die die Änderungen aus `C2` aufheben.","","Durch Reverten kannst du das Zurücknehmen von Änderungen mit anderen teilen."],command:"git revert HEAD",beforeCommand:"git commit"}},{type:"ModalAlert",options:{markdowns:["Um diesen Level abzuschließen musst du sowohl auf `local` also auch auf `pushed` jeweils die zwei letzten Commits zurücknehmen.","","Vergiss nicht, dass `pushed` auch auf einem Server liegt und `local` ein rein lokaler Branch ist -- das sollte dir helfen, die richtige Methode zu wählen."]}}]},ja:{childViews:[{type:"ModalAlert",options:{markdowns:["## 変更を元に戻す","","Gitでは変更を元に戻す方法がたくさんあります。コミットと同じように、低レベルな動作（ファイル別だったりファイルの中の一部だったり）も高レベルな動作（変更のまとまりのキャンセル）もできます。このアプリケーションでは後者の方法について紹介します。","","基本的な巻き戻しの方法は2つあります -- 一つは`git reset`を使う方法で、もう1つは`git revert`を使う方法です。次のダイアログで一つ一つを見ていきます。",""]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["## Git Reset","","`git reset`はブランチのポインタを後方に移動することで変更のキャンセルを実現します。履歴を上書きするような動作だと思うと良いでしょうか。`git reset`はそもそも前のコミットなんかなかったかのように、ブランチのポインタを元に戻してくれます。","","どういう感じか見てみましょう。"],afterMarkdowns:["いいですね！Gitは単純にmasterブランチへのポインタを`C1`へ戻しました。これでこのローカルリポジトリにはまるで`C2`なんて無かったかのように変更をキャンセルできました。"],command:"git reset HEAD~1",beforeCommand:"git commit"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["## Git Revert","","自分のマシン上のブランチではさっきの`git reset`でうまくいきましたが、この「履歴を上書きする」手段は、他の人も使っているリモートにあるリポジトリに対しては使うことができません。","","変更を巻き戻して他の人とそれを共有するためには、`git revert`を使う必要があります。今度はこれを見てみましょう。"],afterMarkdowns:["あれ、おかしいな。巻き戻したいと思ってたコミットの下に新しいコミットが出来上がってしまったみたいです。なぜか。これは、この新しい`C2'`コミットは`C2`へ戻すのに必要な内容を確かに変更して巻き戻していたのです。","","こんな風にして、巻き戻した内容を他人と共有するためにはrevertを使います。"],command:"git revert HEAD",beforeCommand:"git commit"}},{type:"ModalAlert",options:{markdowns:["この章の仕上げに、`local`と`pushed`の両方の直近のコミットを巻き戻してみましょう。","","`pushed`はリモートのブランチで、`local`はローカルであることに注意。正しくコマンドを使い分けましょう。"]}}]},fr_FR:{childViews:[{type:"ModalAlert",options:{markdowns:["## Annuler des changements avec Git","","Il y a de nombreuses façons d'annuler des changements avec Git. De même que pour les commits, annuler des changements avec Git est à la fois un aspect bas-niveau (gestion des fichiers et morceaux de fichiers) et un aspect de plus haut niveau (comment les changements sont effectivement annulés). Nous allons nous intéresser à ce dernier point.","","Il y a principalement deux façons d'annuler des changements avec Git : l'une est `git reset` et l'autre est `git revert`. Nous allons maintenant voir chacune de ces façons.",""]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["## Git Reset","","`git reset` annule des changements en déplaçant la référence en arrière dans le temps sur un commit plus ancien. En ce sens, on peut considérer cela comme une façon de \"réécrire l'histoire\"; `git reset` fait remonter une branche en arrière comme si le(s) commit(s) n'avait jamais eu lieu.","","Regardons à quoi cela ressemble :"],afterMarkdowns:["Bravo ! Git a simplement déplacé la référence de la branche master en la faisant revenir sur `C1`; désormais notre dépôt est dans le même état que si `C2` n'avait jamais eu lieu"],command:"git reset HEAD~1",beforeCommand:"git commit"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["## Git Revert","","Bien que le reset marche parfaitement pour les branches locales sur notre propre machine, cette façon de \"réécrire l'histoire\" ne marche pas avec les banches distantes (remote) que d'autres personnes utilisent.","","Pour pouvoir annuler des changements et *partager* ces annulations avec d'autres, nous devons utiliser `git revert`. Regardons comment cela fonctionne"],afterMarkdowns:["Étrangement, un nouveau commit est apparu en bas sous le commit que nous voulions annuler. C'est parce que ce nouveau commit `C2'` introduit des *modifications* -- celles qui correspondent justement à l'annulation de celles du commit `C2`.","","Avec revert, vous pouvez diffuser (push) vos modifications et les partager avec tout le monde."],command:"git revert HEAD",beforeCommand:"git commit"}},{type:"ModalAlert",options:{markdowns:["Pour accomplir ce niveau, annulez les derniers commits à la fois sur `local` et sur `pushed`. Vous devez annuler en tout 2 commits (un pour chaque branche).","","Ayez à l'esprit que `pushed` est une branche distante et `local` est une branche locale ; cela devrait vous guider dans le choix de la méthode à employer."]}}]},zh_CN:{childViews:[{type:"ModalAlert",options:{markdowns:["## 撤销变更","","在 Git 里撤销变更的方法很多。和提交一样，撤销变更由底层部分（暂存区的独立文件或者片段）和上层部分（变更到底是通过哪种方式被撤销的）组成。我们这个应用主要关注的是后者。","","主要有两种方法用来撤销变更 —— 一是 `git reset`，还有就是 `git revert`。接下来咱们逐个进行讲解。",""]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["## Git Reset","","`git reset` 通过把分支记录回退几个提交记录来实现撤销改动。你可以将这想象成“改写历史”。`git reset` 向上移动分支，原来指向的提交记录就跟从来没有提交过一样。","","让我们来看看演示："],command:"git reset HEAD~1",afterMarkdowns:["漂亮! Git 把 master 分支移回到 `C1`；现在我们的本地代码库根本就不知道有 `C2` 这个提交了。","","（译者注：在reset后， `C2` 所做的变更还在，但是处于未加入暂存区状态。）"],beforeCommand:"git commit"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["## Git Revert","","虽然在你的本地分支中使用 `git reset` 很方便，但是这种“改写历史”的方法对大家一起使用的远程分支是无效的哦！","","为了撤销更改并**分享**给别人，我们需要使用 `git revert`。来看演示："],command:"git revert HEAD",afterMarkdowns:["奇怪！在我们要撤销的提交记录后面居然多了一个新提交！这是因为新提交记录 `C2'` 引入了**更改** —— 这些更改刚好是用来撤销 `C2` 这个提交的。也就是说 `C2'` 的状态与 `C1` 是相同的。","","revert 之后就可以把你的更改推送到远程仓库与别人分享啦。"],beforeCommand:"git commit"}},{type:"ModalAlert",options:{markdowns:["要完成此关，分别撤销 `local` 分支和 `pushed` 分支上的最近一次提交。共需要撤销两个提交（每个分支一个）。","","记住 `pushed` 是远程分支，`local` 是本地分支 —— 这么说你应该知道用分别哪种方法了吧？"]}}]},zh_TW:{childViews:[{type:"ModalAlert",options:{markdowns:["## 取消 git 的修改","","在 git 裡面取消修改的方法很多。和 commit 一樣，在 git 裡面取消修改同時具有底層的部份（暫存一些獨立的文件或者片段）和高層的部份（修改是如何被取消）。我們主要講的重點是後者。","","在 git 裡主要用兩種方法來取消修改，一種是 `git reset`，另外一種是 `git revert`。讓我們在下一個對話視窗中逐一瞭解它們。",""]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["## Git Reset","",'`git reset` 把分支的參考點退回到上一個 commit 來取消修改。你可以認為這是在"重寫歷史"。`git reset` 往回移動 branch，原來的 branch 所指向的 commit 好像從來沒有存在過一樣。',"","讓我們來看看要怎麼操作："],command:"git reset HEAD~1",afterMarkdowns:["太好了! Git 把 master branch 簡單地移回到 `C1`；現在在我們的 local 已經退回到沒有 commit 過 `C2` 的狀態了。"],beforeCommand:"git commit"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["## Git Revert","","雖然在你的 local branch 中使用 `git reset` 很方便，但是這種「改寫歷史」的方法對別人的 remote branch 是無效的哦！","","為了取消修改並且把這個狀態*分享*給別人，我們需要使用 `git revert`。舉個例子"],command:"git revert HEAD",afterMarkdowns:["很奇怪吧！在我們要取消的 commit 後面居然多了一個新的 commit！這是因為新的 commit `C2'` 引入了*修改*——用來表示我們取消 `C2` 這個 commit 的修改。","","多虧了 revert，現在可以把你的修改分享給別人啦。"],beforeCommand:"git commit"}},{type:"ModalAlert",options:{markdowns:["要完成這一關，分別取消 `local` branch 和 `pushed` branch 上的最近的一次 commit。","","記住 `pushed` 是一個 remote branch，`local` 是一個 local branch，有了這麼明顯的提示應該知道要用哪種方法了吧？"]}}]},ko:{childViews:[{type:"ModalAlert",options:{markdowns:["## Git에서 작업 되돌리기","","Git에는 작업한 것을 되돌리는 여러가지 방법이 있습니다. 변경내역을 되돌리는 것도 커밋과 마찬가지로 낮은 수준의 일(개별 파일이나 묶음을 스테이징 하는 것)과 높은 수준의 일(실제 변경이 복구되는 방법)이 있는데요, 여기서는 후자에 집중해 알려드릴게요.","","Git에서 변경한 내용을 되돌리는 방법은 크게 두가지가 있습니다 -- 하나는 `git reset`을 쓰는거고, 다른 하나는 `git revert`를 사용하는 것입니다. 다음 화면에서 하나씩 알아보겠습니다.",""]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["## Git 리셋(reset)","",'`git reset`은 브랜치로 하여금 예전의 커밋을 가리키도록 이동시키는 방식으로 변경 내용을 되돌립니다. 이런 관점에서 "히스토리를 고쳐쓴다"라고 말할 수 있습니다. 즉, `git reset`은 마치 애초에 커밋하지 않은 것처럼 예전 커밋으로 브랜치를 옮기는 것입니다.',"","어떤 그림인지 한번 보죠:"],afterMarkdowns:["그림에서처럼 master 브랜치가 가리키던 커밋을 `C1`로 다시 옮겼습니다; 이러면 로컬 저장소에는 마치 `C2`커밋이 아예 없었던 것과 마찬가지 상태가 됩니다."],command:"git reset HEAD~1",beforeCommand:"git commit"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["## Git 리버트(revert)","",'각자의 컴퓨터에서 작업하는 로컬 브랜치의 경우 리셋(reset)을 잘 쓸 수 있습니다만, "히스토리를 고쳐쓴다"는 점 때문에 다른 사람이 작업하는 리모트 브랜치에는 쓸 수 없습니다.',"","변경분을 되돌리고, 이 되돌린 내용을 다른 사람들과 *공유하기* 위해서는, `git revert`를 써야합니다. 예제로 살펴볼게요."],afterMarkdowns:["어색하게도, 우리가 되돌리려고한 커밋의 아래에 새로운 커밋이 생겼습니다. `C2`라는 새로운 커밋에 *변경내용*이 기록되는데요, 이 변경내역이 정확히 `C2` 커밋 내용의 반대되는 내용입니다.","","리버트를 하면 다른 사람들에게도 변경 내역을 밀어(push) 보낼 수 있습니다."],command:"git revert HEAD",beforeCommand:"git commit"}},{type:"ModalAlert",options:{markdowns:["이 레벨을 통과하려면, `local` 브랜치와 `pushed` 브랜치에 있는 최근 두 번의 커밋을 되돌려 보세요.","","`pushed`는 리모트 브랜치이고, `local`은 로컬 브랜치임을 신경쓰셔서 작업하세요 -- 어떤 방법을 선택하실지 떠오르시죠?"]}}]},ru_RU:{childViews:[{type:"ModalAlert",options:{markdowns:["## Отмена изменений в Git","","Есть много путей для отмены изменений в Git. Так же как и коммит, отмена изменений в Git возможна и на низком уровне (добавление в коммит отдельных файлов и наборов строк), и на высоком (как изменения реально отменяются). Сейчас сфокусируемся на высокоуровневой части.","","Есть два основных способа отмены изменений в Git: первый - это `git reset`, а второй - `git revert`. Попробуем оба на следующем шаге.",""]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["## Git Reset","",'`git reset` отменяет изменения, перенося ссылку на ветку назад, на более старый коммит. Это своего рода "переписывание истории"; `git reset` перенесёт ветку назад, как будто некоторых коммитов вовсе и не было.',"","Посмотрим, как это работает:"],afterMarkdowns:["Неплохо! Git просто перенёс ссылку на `master` обратно на коммит `C1`. Теперь наш локальный репозиторий в состоянии, как будто `C2` никогда не существовал."],command:"git reset HEAD~1",beforeCommand:"git commit"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["## Git Revert","","Reset отлично работает на локальных ветках, в локальных репозиториях. Но этот метод переписывания истории не сработает на удалённых ветках, которые используют другие пользователи.","","Чтобы отменить изменения и поделиться отменёнными изменениями с остальными, надо использовать `git revert`. Посмотрим, как это работает"],afterMarkdowns:["Забавно, появился новый коммит. Дело в том, что новый коммит `C2'` просто содержит изменения, полностью противоположные тем, что сделаны в коммите `C2`.","","После `revert` можно сделать `push` и поделиться изменениями с остальными."],command:"git revert HEAD",beforeCommand:"git commit"}},{type:"ModalAlert",options:{markdowns:["Чтобы пройти этот уровень, отмени два последних коммита и в `local`, и в `pushed`","","Помни, что `pushed` - это remote ветка, а `local` - это локальная ветка. Это поможет выбрать способ отмены изменений."]}}]},uk:{childViews:[{type:"ModalAlert",options:{markdowns:["## Відміна змін в Git","","Є декілька шляхів відмини змін в Git. І так само як і коміти, зміни в гіт можна відміняти використовуючи або низькорівневі методи (додавання в коміт окремих файлів) так і високорівневі. Ми зосередемось на останніх.","","Є два основні шляхи відміни змін в Git -- перший це використовувати `git reset` й інший це `git revert`. В наступному слайді ми подивимося на кожний з них",""]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["## Git Reset","",'`git reset` відміняє зміни переміщуючи вказівник гілки назад в історії на старіший коміт. В принципі, можна вважати що це певне "переписування історії;" Коли `git reset` перемістить гілку назад буде здаватися, що відмінений коміт взагалі ніколи не створювався.',"","Давайте подивимося, як це виглядає:"],afterMarkdowns:["Чудово! Git перемістив посилання гілки master назад до `C1`; тепер наш локальний репозиторій в такому стані, наче коміту `C2` ніколи не було."],command:"git reset HEAD~1",beforeCommand:"git commit"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["## Git Revert","",'Команда reset чудово працює для локальних бранчів на власному комп’ютері, але так як вона спричиняє "переписування історії", її не можна використовувати в ситуації коли кілька користувачів працюють з цим бранчем',"","Для того щоб відкотити зміни й потім *поділитися* цими відкоченими змінами з друзями, потрібно використовувати `git revert`. Давай подивимось на прикладі"],afterMarkdowns:["Дивно, був створений новий коміт, нижче того коміту який ми хотіли відкотити. Це сталося тому що новий коміт `C2'` містить *зміни*  які повністю протилежні змінам `C2`.","","Після revert, ти зможеш зробити push щоб поділитися гілкою з іншими."],command:"git revert HEAD",beforeCommand:"git commit"}},{type:"ModalAlert",options:{markdowns:["Щоб пройти цей рівень відміни два останні коміти на гілках `local` та `pushed`.","","Зауваж, що `pushed` це віддалена гілка, а `local` це локальна гілка -- це має допомогти з вибором методу."]}}]},vi:{childViews:[{type:"ModalAlert",options:{markdowns:["## Hoàn tác trong Git","","Có rất nhiều cách để hoàn tác thay đổi trong Git. Và cũng tương tự như commit, hủy thay đổi trong Git có cả thành phần bậc thấp (tạm thời lưu trữ một số tệp hoặc đoạn độc lập) và thành phần bậc cao (cách mà các thay đổi thực sự bị hủy). Ứng dụng của chúng tôi tập trung vào cái sau.","","Có 2 cách nguyên thủy để hủy thay đổi trong Git -- một là dùng `git reset` và cách khác là dùng `git revert`. Chúng ta sẽ xem xét từng cái trong hội thoại sau",""]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["## Git Reset","",'`git reset` hoàn tác bằng cách chuyển tham chiếu của nhánh ngược lên commit cũ hơn. Bạn có thể hiểu nó như kiểu "viết lại lịch sử;" `git reset` sẽ dịch chuyển nhánh lên trên như thể commit chưa bao giờ được tạo ra vậy.',"","Cùng xem thử nó trông thế nào nào:"],afterMarkdowns:["Hay! Git chuyển tham chiếu của master trở lại `C1`; bây giờ kho cá nhân của ta trông như thể commit `C2` chưa bao giờ xảy ra vậy."],command:"git reset HEAD~1",beforeCommand:"git commit"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["## Git Revert","",'Trong khi git reset hoạt động rất tốt tại nhánh cục bộ trên máy cá nhân, cách thức "viết lại lịch sử" chẳng hề có tác dụng lên nhánh ở phương xa mà người khác sử dụng.',"","Để có thể hoàn tác và *chia sẻ* hoàn tác đó với người khác, thì ta cần sử dụng `git revert`. Xem thử cách thức nó hoạt động nào"],afterMarkdowns:["Lạ nhỉ, một commit mới được thả vào bên dưới commit mà ta muốn hoàn tác. Đó là bởi vì commit mới `C2'` này có chứa *thay đổi* -- đó là những thay đổi về hoàn tác commit `C2`.","","Dùng revert thì bạn có thể đẩy thay đổi mình lên và chia sẻ với người khác."],command:"git revert HEAD",beforeCommand:"git commit"}},{type:"ModalAlert",options:{markdowns:["Để hoàn thành cấp độ này, hoàn tác commit gần nhất trên cả `local` (`cục bộ`) và `pushed` (`được đẩy`). Bạn sẽ hoàn tác tổng cộng 2 commit(một trên mỗi nhánh).","","Nhớ rằng `pushed` là nhánh ở phương xa và `local` là nhánh địa phương -- như thế thì bạn sẽ chọn được phương án phù hợp."]}}]}}}},{}],129:[function(e,t,o){o.level={compareOnlyMasterHashAgnostic:!0,disabledMap:{"git revert":!0,"git cherry-pick":!0},goalTreeString:"%7B%22branches%22%3A%7B%22master%22%3A%7B%22target%22%3A%22C7%27%22%2C%22id%22%3A%22master%22%7D%2C%22bugFix%22%3A%7B%22target%22%3A%22C3%27%22%2C%22id%22%3A%22bugFix%22%7D%2C%22side%22%3A%7B%22target%22%3A%22C6%27%22%2C%22id%22%3A%22side%22%7D%2C%22another%22%3A%7B%22target%22%3A%22C7%27%22%2C%22id%22%3A%22another%22%7D%7D%2C%22commits%22%3A%7B%22C0%22%3A%7B%22parents%22%3A%5B%5D%2C%22id%22%3A%22C0%22%2C%22rootCommit%22%3Atrue%7D%2C%22C1%22%3A%7B%22parents%22%3A%5B%22C0%22%5D%2C%22id%22%3A%22C1%22%7D%2C%22C2%22%3A%7B%22parents%22%3A%5B%22C1%22%5D%2C%22id%22%3A%22C2%22%7D%2C%22C3%22%3A%7B%22parents%22%3A%5B%22C1%22%5D%2C%22id%22%3A%22C3%22%7D%2C%22C4%22%3A%7B%22parents%22%3A%5B%22C0%22%5D%2C%22id%22%3A%22C4%22%7D%2C%22C5%22%3A%7B%22parents%22%3A%5B%22C4%22%5D%2C%22id%22%3A%22C5%22%7D%2C%22C6%22%3A%7B%22parents%22%3A%5B%22C5%22%5D%2C%22id%22%3A%22C6%22%7D%2C%22C7%22%3A%7B%22parents%22%3A%5B%22C5%22%5D%2C%22id%22%3A%22C7%22%7D%2C%22C3%27%22%3A%7B%22parents%22%3A%5B%22C2%22%5D%2C%22id%22%3A%22C3%27%22%7D%2C%22C4%27%22%3A%7B%22parents%22%3A%5B%22C3%27%22%5D%2C%22id%22%3A%22C4%27%22%7D%2C%22C5%27%22%3A%7B%22parents%22%3A%5B%22C4%27%22%5D%2C%22id%22%3A%22C5%27%22%7D%2C%22C6%27%22%3A%7B%22parents%22%3A%5B%22C5%27%22%5D%2C%22id%22%3A%22C6%27%22%7D%2C%22C7%27%22%3A%7B%22parents%22%3A%5B%22C6%27%22%5D%2C%22id%22%3A%22C7%27%22%7D%7D%2C%22HEAD%22%3A%7B%22target%22%3A%22master%22%2C%22id%22%3A%22HEAD%22%7D%7D",solutionCommand:"git rebase master bugFix;git rebase bugFix side;git rebase side another;git rebase another master",startTree:'{"branches":{"master":{"target":"C2","id":"master"},"bugFix":{"target":"C3","id":"bugFix"},"side":{"target":"C6","id":"side"},"another":{"target":"C7","id":"another"}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"},"C2":{"parents":["C1"],"id":"C2"},"C3":{"parents":["C1"],"id":"C3"},"C4":{"parents":["C0"],"id":"C4"},"C5":{"parents":["C4"],"id":"C5"},"C6":{"parents":["C5"],"id":"C6"},"C7":{"parents":["C5"],"id":"C7"}},"HEAD":{"target":"master","id":"HEAD"}}',name:{en_US:"Rebasing over 9000 times",de_DE:"10000 Rebases unter dem `HEAD`",es_AR:"Rebaseando más de 9000 veces",es_ES:"Rebaseando más de 9000 veces",pt_BR:"Fazendo mais de 9000 rebases",gl:"Facendo máis de 9000 rebases",fr_FR:"Rebaser plus de 1000 fois",ko:"9천번이 넘는 리베이스",ja:"9000回以上のrebase",zh_CN:"多次 Rebase",zh_TW:"N次Rebase",ru_RU:"Rebase over 9000 раз",uk:"Rebase over 9000 разів",vi:"Rebase hơn 9000 lần"},hint:{en_US:"Remember, the most efficient way might be to only update master at the end...",de_DE:"Nicht vergessen: die effizienteste Möglichkeit könnte sein, schließlich einfach nur den master zu aktualisieren ...",es_AR:"Acordate, la manera más eficiente podría ser actualizar master sólo al final...",es_ES:"Recuerda, la manera más eficiente podría ser actualizar master sólo al final...",pt_BR:"Lembre-se, a forma mais eficiente pode ser atualizar o master por último...",gl:"Lembra, a forma máis eficiente pode ser actualizar a rama master ó final...",fr_FR:"Rappelez-vous, la façon la plus efficace peut être de mettre à jour master seulement à la fin ...",ja:"最も効率的なやり方はmasterを最後に更新するだけかもしれない・・・",ko:"아마도 master를 마지막에 업데이트하는 것이 가장 효율적인 방법일 것입니다...",zh_CN:"记住，最后更新 master 分支可能是最高效的方法……",zh_TW:"要記住喔! 把 master branch 留到最後更新可能是最有效率的方法。",ru_RU:"Не забудь, что лучше всего сдвинуть мастер в самом конце...",uk:"Не забувай, що краще всього буде перемістити master в самому кінці... ",vi:"Hãy nhớ rằng, cách tốt nhất có lẽ là nên cuối cùng mới cập nhật nhánh `master`... "},startDialog:{en_US:{childViews:[{type:"ModalAlert",options:{markdowns:["### Rebasing Multiple Branches","","Man, we have a lot of branches going on here! Let's rebase all the work from these branches onto master.","","Upper management is making this a bit trickier though -- they want the commits to all be in sequential order. So this means that our final tree should have `C7'` at the bottom, `C6'` above that, and so on, all in order.","","If you mess up along the way, feel free to use `reset` to start over again. Be sure to check out our solution and see if you can do it in fewer commands!"]}}]},es_AR:{childViews:[{type:"ModalAlert",options:{markdowns:["### Rebaseando múltiples ramas","","Man, ¡hay un montón de ramas acá! Rebaseemos todo el trabajo de esas ramas sobre master.","","La gente de administración nos está haciendo las cosas un poco complicadas, igual -- quieren que nuestros commits estén todos en orden secuencial. Esto significa que nuestro árbol final tendría que tener `C7` al final, `C6` antes de ese, y así siguiendo, todos en orden.","","Si hacés líos en el camino, sentite libre de usar `reset` para empezar de nuevo. ¡Asegurate de verificar tu solución y ver si podés hacerla en alguna cantidad menor de commandos!"]}}]},es_ES:{childViews:[{type:"ModalAlert",options:{markdowns:["### Rebaseando múltiples ramas","","Fíjate, ¡hay un montón de ramas aquí! Rebaseemos todo el trabajo de esas ramas sobre master.","","La gente de administración nos está haciendo las cosas un poco complicadas, igual -- quieren que nuestros commits estén todos en orden secuencial. Esto significa que nuestro árbol final tendría que tener `C7` al final, `C6` antes de ese, y así siguiendo, todos en orden.","","Si te haces un lío durante el proceso, siéntete libre de usar `reset` para empezar de nuevo. ¡Asegúrate de verificar tu solución y ver si puedes realizarla en un número inferior de commandos!"]}}]},pt_BR:{childViews:[{type:"ModalAlert",options:{markdowns:["### Fazendo rebase em múltiplos ramos","","Cara, temos um monte de ramos aqui! Vamos fazer um rebase de todo o trabalho contido nesses ramos para o master.","","No entanto, a cúpula da administração está tornando as coisas mais difíceis -- eles querem que os commits estejam todos em ordem sequencial. Isso significa que a nossa árvore final precisa ter o `C7'` por último, `C6'` acima disso, e assim por diante, tudo ordenado.","","Se você fizer besteira, sinta-se livre para usar o comando `reset` para recomeçar do zero. Depois lembre de olhar nossa solução do gabarito para ver se consegue resolver a tarefa usando menos comandos!"]}}]},gl:{childViews:[{type:"ModalAlert",options:{markdowns:["### Fazendo rebase en múltiples ramas","","Neno, temos unha chea de ramas aquí! Imos facer rebase de todo o traballo contido nesas ramas para a master.","","A xente de administración estanos a facer as cousas complicadas, igual eles queren que os commits estén todos en orde secuencial. Isto significa que a nosa árbore final precisa ter `C7'` de último, `C6'` inda por riba, está por adiante, todo ordeado.","","Se te fas un lio polo camiño, síntete ceibe para usar o comando `reset` para comezar de cero outra vez. Despois lembra ollar a nosa solución para ver se consegues resolver a tarefa usando menos comandos!"]}}]},fr_FR:{childViews:[{type:"ModalAlert",options:{markdowns:["### Rebaser plusieurs branches","","Dis-donc, nous avons beaucoup de branches par ici ! Rebasons tout le travail de ces branches dans master.","","Les patrons rendent cela encore plus compliqué -- ils veulent que les commits soient fait de manière séquentielle. Cela signifie donc que dans votre arbre final `C7'` est tout en bas, `C6'` juste au-dessus, et ainsi de suite, tout dans cet ordre.","","Si vous faites une erreur en chemin, n'hésitez pas à utiliser `reset` pour recommencer. Pensez à comparer votre solution à la notre et voyez si vous pouvez le faire en moins de commandes !"]}}]},de_DE:{childViews:[{type:"ModalAlert",options:{markdowns:["### Mehrere Branches rebasen","","Wow, wir haben hier ja eine Menge Branches! Lass uns mal die ganze Arbeit, die in diesen Branches steckt, auf den `master` packen, um sie auf Stand zu bringen.","","Die Führungsetage macht die Sache allerdings etwas trickreicher -- die möchten, dass alle Commits in aufsteigender Reihenfolge geordnet sind. Das heißt unser fertiger Baum sollte `C7` ganz unten haben, darüber `C6` und so weiter und so fort.","","Wenn du irgendwo einen Fehler machst, benütze ruhig `reset` um wieder von vorne anzufangen oder `undo` um einen Schritt zurückzugehen. Schau dir die Lösung an und versuch es in weniger Schritten hinzubekommen."]}}]},ja:{childViews:[{type:"ModalAlert",options:{markdowns:["### 複数のブランチをリベースする","","さあ、いくつものブランチが出てきます。このブランチたち全てをmasterブランチにリベースしましょう。","","おエライさん方が今回の仕事を少しトリッキーにしてくれました -- コミットはすべて一列の連続した状態にしてほしいそうです。つまり私たちが作るリポジトリの最終的なツリーの状態は、`C7'`が最後に来て、`C6'`がその一つ上に来て、、と順に積み重なるイメージです。","","試行錯誤してツリーが汚くなってきたら、`reset`コマンドを使ってツリーの状態を初期化してください。模範解答をチェックして、それよりも簡単なコマンドで済ませられるかどうかを考えるのも忘れずに！"]}}]},zh_CN:{childViews:[{type:"ModalAlert",options:{markdowns:["### 多分支 rebase","","哥们儿，我们准备了很多分支！咱们把这些分支 rebase 到 master 上吧。","","但是你的领导给你提了点要求 —— 他们希望得到有序的提交历史，也就是我们最终的结果应该是 `C6'` 在 `C7'` 上面， `C5'` 在 `C6'` 上面，依此类推。","","即使你搞砸了也没关系，用 `reset` 命令就可以重新开始了。记得看看我们提供的答案，看你能否使用更少的命令来完成任务！"]}}]},zh_TW:{childViews:[{type:"ModalAlert",options:{markdowns:["### rebase 多個 branch","","嗨！現在我們有很多 branch 了啦！讓我們做一下 rebase，將這些分支接到 master branch 上吧。","","但是你的主管找了點麻煩，他們希望得到有序的 commit history，也就是我們最終的結果是 `C7'` 在最下面，`C6'` 在它上面，以此類推。","","假如你搞砸了，沒有關係啦！你用 `reset` 就可以重新開始！記得看看我們提供的答案，看你是否能夠使用更少的指令完成這一關！"]}}]},ko:{childViews:[{type:"ModalAlert",options:{markdowns:["### 여러 브랜치를 리베이스(rebase)하기 ","","음, 여기 꽤 여러개의 브랜치가 있습니다! 이 브랜치들의 모든 작업내역을 master에 리베이스 해볼까요?","","윗선에서 일을 복잡하게 만드네요 -- 그 분들이 이 모든 커밋들을 순서에 맞게 정렬하라고 합니다. 그럼 결국 우리의 최종 목표 트리는 제일 아래에 `C7'` 커밋, 그 위에 `C6'` 커밋, 또 그 위에 순서대로 보여합니다.","","만일 작업중에 내용이 꼬인다면, `reset`이라고 쳐서 처음부터 다시 시작할 수 있습니다. 모범 답안을 확인해 보시고, 혹시 더 적은 수의 커맨드로 해결할 수 있는지 알아보세요!"]}}]},ru_RU:{childViews:[{type:"ModalAlert",options:{markdowns:["### Rebase на нескольких ветках","","У нас тут куча веток! Было бы круто перенести все изменения из них в мастер.","","Но начальство усложняет нашу задачу тем, что желает видеть все коммиты по порядку. Так что коммит `С7'` должен идти после коммита `С6'` и так далее.","","Если что-то пойдёт не так – не надо стесняться использовать `reset`, чтобы начать всё с чистого листа. Постарайся сделать как можно меньше манипуляций!"]}}]},uk:{childViews:[{type:"ModalAlert",options:{markdowns:["### Ребейсимо кілька гілок","","В нас тут до біса гілок! Перенесімо всі зміни з різних гілок в master.","","Але вище керівництво нам не полегшує життя -- вони хочуть, щоб всі коміти були впорядковані. Це означає, що в результаті коміт `C7'` має бути з самого низу, `C6'` трохи вище, і так далі, все за порядком.","","Якщо ти щось зробиш не так, сміливо використовуй `reset` щоб почати спочатку. Подивись на наш розв’язок і подумай, чи ти можеш обійтись меншою кількістю команд!"]}}]},vi:{childViews:[{type:"ModalAlert",options:{markdowns:["### Rebase nhiều nhánh","","Giời ạ, sao mà nhiều nhánh thế khôn biết! Chuyển hết chúng vào `master` thôi.","","Nhưng mà cha quản lý lại muốn oái oăm hơn cơ -- hắn muốn tất cả commit xếp thẳng hàng. Nghĩa là cây lịch sử của ta sẽ có `C7'` ở cuối, phía trên là`C6'`, và cứ thế theo đúng thứ tự.","","Nếu mà nhỡ may bạn làm nhầm thì có thể dùng lệnh `reset` để bắt đầu lại. Hãy nhớ đối chiếu với đáp án của chúng tôi xem bạn có thể hoàn thành với ít câu lệnh hơn không!"]}}]}}}},{}],130:[function(e,t,o){o.level={compareAllBranchesHashAgnostic:!0,disabledMap:{"git revert":!0},goalTreeString:"%7B%22branches%22%3A%7B%22master%22%3A%7B%22target%22%3A%22C5%22%2C%22id%22%3A%22master%22%7D%2C%22one%22%3A%7B%22target%22%3A%22C2%27%22%2C%22id%22%3A%22one%22%7D%2C%22two%22%3A%7B%22target%22%3A%22C2%27%27%22%2C%22id%22%3A%22two%22%7D%2C%22three%22%3A%7B%22target%22%3A%22C2%22%2C%22id%22%3A%22three%22%7D%7D%2C%22commits%22%3A%7B%22C0%22%3A%7B%22parents%22%3A%5B%5D%2C%22id%22%3A%22C0%22%2C%22rootCommit%22%3Atrue%7D%2C%22C1%22%3A%7B%22parents%22%3A%5B%22C0%22%5D%2C%22id%22%3A%22C1%22%7D%2C%22C2%22%3A%7B%22parents%22%3A%5B%22C1%22%5D%2C%22id%22%3A%22C2%22%7D%2C%22C3%22%3A%7B%22parents%22%3A%5B%22C2%22%5D%2C%22id%22%3A%22C3%22%7D%2C%22C4%22%3A%7B%22parents%22%3A%5B%22C3%22%5D%2C%22id%22%3A%22C4%22%7D%2C%22C5%22%3A%7B%22parents%22%3A%5B%22C4%22%5D%2C%22id%22%3A%22C5%22%7D%2C%22C4%27%22%3A%7B%22parents%22%3A%5B%22C1%22%5D%2C%22id%22%3A%22C4%27%22%7D%2C%22C3%27%22%3A%7B%22parents%22%3A%5B%22C4%27%22%5D%2C%22id%22%3A%22C3%27%22%7D%2C%22C2%27%22%3A%7B%22parents%22%3A%5B%22C3%27%22%5D%2C%22id%22%3A%22C2%27%22%7D%2C%22C5%27%22%3A%7B%22parents%22%3A%5B%22C1%22%5D%2C%22id%22%3A%22C5%27%22%7D%2C%22C4%27%27%22%3A%7B%22parents%22%3A%5B%22C5%27%22%5D%2C%22id%22%3A%22C4%27%27%22%7D%2C%22C3%27%27%22%3A%7B%22parents%22%3A%5B%22C4%27%27%22%5D%2C%22id%22%3A%22C3%27%27%22%7D%2C%22C2%27%27%22%3A%7B%22parents%22%3A%5B%22C3%27%27%22%5D%2C%22id%22%3A%22C2%27%27%22%7D%7D%2C%22HEAD%22%3A%7B%22target%22%3A%22two%22%2C%22id%22%3A%22HEAD%22%7D%7D",solutionCommand:"git checkout one; git cherry-pick C4 C3 C2; git checkout two; git cherry-pick C5 C4 C3 C2; git branch -f three C2",startTree:'{"branches":{"master":{"target":"C5","id":"master"},"one":{"target":"C1","id":"one"},"two":{"target":"C1","id":"two"},"three":{"target":"C1","id":"three"}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"},"C2":{"parents":["C1"],"id":"C2"},"C3":{"parents":["C2"],"id":"C3"},"C4":{"parents":["C3"],"id":"C4"},"C5":{"parents":["C4"],"id":"C5"}},"HEAD":{"target":"master","id":"HEAD"}}',name:{ko:"브랜치 스파게티",en_US:"Branch Spaghetti",fr_FR:"Branche spaghetti",de_DE:"Branch-Spaghetti",es_AR:"Enslada de branches",es_ES:"Ensalada de ramas",pt_BR:"Espaguete de ramos",gl:"Espaguete de ramas",ja:"ブランチスパゲッティ",zh_CN:"纠缠不清的分支",zh_TW:"branch 漿糊",ru_RU:"Спутанные ветки",uk:"Макарони з гілок",vi:"Nhánh rối như canh hẹ"},hint:{en_US:"Make sure to do everything in the proper order! Branch one first, then two, then three",fr_FR:"Faites attention à tout faire dans le bon ordre ! La branche one d'abord, puis la seconde, puis la troisième",de_DE:"Stelle sicher, dass du alles in der richtigen Reihenfolge machst! Branche erst one, dann two, dann three.",es_AR:"¡Asegurate de hacer las cosas en el orden correcto! Brancheá `one` primero, después `two`, y después `three`.",es_ES:"¡Asegúrate de hacer las cosas en el orden correcto! Crea primero la rama `one`, después `two`, y después `three`.",pt_BR:"Certifique-se de fazer tudo na ordem correta! Crie o ramo `one` primeiro, depois `two`, depois `three`.",gl:"¡Afiánzate de facer as cousas no orde correcto! Crea ramas `one` de primeiras, e logo `two` e `three`.",ja:"全て正しい順番で処理すること！oneが最初で、次がtwo、最後にthreeを片付ける。",ko:"이 문제를 해결하는 방법은 여러가지가 있습니다! 체리픽(cherry-pick)이 가장 쉽지만 오래걸리는 방법이고, 리베이스(rebase -i)가 빠른 방법입니다",zh_CN:"确保你是按照正确的顺序来操作！先操作分支 `one`, 然后 `two`, 最后才是 `three`",zh_TW:"確認你是按照正確的順序來操作！先操作 branch  `one`, 然後 `two`, 最後才是 `three`",ru_RU:"Убедись, что у нас всё по порядку! Сначала ветка `one`, потом `two` и только потом `three`",uk:"Переконайся, що все йде за порядком! Спершу гілка `one`, потім `two`, і тільки потім `three`",vi:"Hãy chắc chắn rằng bạn làm đúng thứ tự! Nhánh `one` trước, rồi `two`, rồi mới đến `three`"},startDialog:{en_US:{childViews:[{type:"ModalAlert",options:{markdowns:["## Branch Spaghetti","","WOAHHHhhh Nelly! We have quite the goal to reach in this level.","","Here we have `master` that is a few commits ahead of branches `one` `two` and `three`. For whatever reason, we need to update these three other branches with modified versions of the last few commits on master.","","Branch `one` needs a re-ordering and a deletion of `C5`. `two` needs pure reordering, and `three` only needs one commit!","","We will let you figure out how to solve this one -- make sure to check out our solution afterwards with `show solution`. "]}}]},fr_FR:{childViews:[{type:"ModalAlert",options:{markdowns:["## Branche spaghetti","","WOAHHHhhh ! Nous avons pas mal d'objectifs dans ce niveau.","","Actuellement nous avons `master` qui se situe quelques commits devant les branches `one` `two` et `three`. Pour une raison quelconque, nous avons besoin de mettre ces trois branches à jour avec les modifications des derniers commits sur master.","","La branche `one` a besoin d'une réorganisation et de la suppression de `C5`. `two` doit simplement être réordonnée, et `three` ne nécessite qu'un commit !","","Nous vous laissons imaginer la solution pour ce niveau; comparez avec notre solution après-coup avec la commande `show solution`. "]}}]},es_AR:{childViews:[{type:"ModalAlert",options:{markdowns:["## Ensalada de branches","","¡WOAHHHhhh Nelly! Tenemos un _pequeño_ objetivo al que llegar en este nivel.","","Tenemos un `master` que está algunos commits adelante de `one`, `two` y `three`. Por alguna razón, necesitamos actualizar esas tres ramas con versiones modificadas de los últimos commits de master.","","La rama `one` necesita reordenarse, y eliminar `C5`. `two` necesita sólo reordenamiento, y `three` ¡sólo necesita un commit!","","Te vamos a dejar darte cuenta cómo resolver este -- asegurate de mirar la solución, después, usando `show solution`. "]}}]},es_ES:{childViews:[{type:"ModalAlert",options:{markdowns:["## Ensalada de ramas","","¡Vaya, vaya! Tenemos un _pequeño_ objetivo al que llegar en este nivel.","","La rama `master` se encuentra algunos commits por delante de `one`, `two` y `three`. Por alguna razón, necesitamos actualizar esas tres ramas con versiones modificadas de los últimos commits de master.","","La rama `one` necesita reordenarse, y eliminar `C5`. `two` necesita sólo reordenamiento, y `three` ¡sólo necesita un commit!","","Vamos a dejar que intentes resolver este -- asegúrate de mirar la solución, después, usando `show solution`. "]}}]},pt_BR:{childViews:[{type:"ModalAlert",options:{markdowns:["## Espaguete de ramos","","Uhuuuuu Nelly! Temos um belo de um objetivo para alcançar neste nível.","","Temos aqui um `master` que está alguns commits atrás dos ramos `one`, `two` e `three`. Seja lá por qual razão, precisamos atualizar esses três outros ramos com versões modificadas dos últimos commits do master.","","O ramo `one` precisa de uma reordenação e da exclusão do `C5`. O `two` precisa apenas de reordenação. O `three` precisa de um único commit!","","Vamos deixar você descobrir como resolver esta tarefa -- mas não deixe de ver a nossa solução depois com o comando `show solution`. "]}}]},gl:{childViews:[{type:"ModalAlert",options:{markdowns:["## Espaguete de ramas","","¡Íscalle lura! Temos un _pequeno_ obxectivo que acadar neste nivel.","","Temos aquí un `master` que está algúns commits por detrás das ramas `one`, `two` e `three`. Por algunha razón, precisamos atualizar esas tres ramas con versións modificadas dos últimos commits de master.","","A rama `one` precisa de unha reordenación, e votar fora a `C5`. O `two` precisa apenas de reordenacións. O `three` precisa dun único commit!","","Ímoste deixar resolver o problema por ti mesmo -- pero non deixes de ver a nosa solución, para eso escrebe `show solution`. "]}}]},de_DE:{childViews:[{type:"ModalAlert",options:{markdowns:["## Branch-Spaghetti","","Puh! Wir haben ein ganz schön schweres Ziel für dieses Level.","","Wir haben hier einen `master`, der ein paar Commits weiter ist als die Branche `one`, `two` und `three`. Aus welchem Grund auch immer müssen wir diese drei anderen Branches mit modifizierten Versionen der paar letzten Commits von `master` aktualisieren.","","Branch `one` benötigt eine Umsortierung und `C5` muss gelöscht werden. `two` muss nur umsortiert werden und `three` braucht nur einen Commit!","","Ich lass dich diese Aufgabe selbst lösen -- schau dir hinterher auf jeden Fall die Lösung mit `show solution` an."]}}]},ja:{childViews:[{type:"ModalAlert",options:{markdowns:["## ブランチスパゲッティ","","なんということでしょう。今回のレベルクリアのために、やることがたくさんあります。","","いま`master`が指しているコミットの数個前のコミットに、ブランチ`one`、`two`それから`three`があります。何か事情があって、これらの3つのブランチをmasterが指している最新の状態に更新したいケースを考えます。","","ブランチ`one`に対しては、順序の変更と`C5`の削除が必要です。`two`では順序の変更のみ、`three`に対しては1回だけコミットすればOKです。","","`show solution`コマンドで模範解答を確認できますから、こちらも利用してください。 "]}}]},zh_CN:{childViews:[{type:"ModalAlert",options:{markdowns:["## 纠缠不清的分支","","哇塞大神！这关我们要来点不同的！","","现在我们的 `master` 分支是比 `one`、`two` 和 `three` 要多几个提交。出于某种原因，我们需要把 `master` 分支上最近的几次提交做不同的调整后，分别添加到各个的分支上。","","`one` 需要重新排序并删除 `C5`，`two` 仅需要重排排序，而 `three` 只需要提交一次。","","慢慢来，你会找到答案的 —— 记得通关之后用 `show solution` 看看我们的答案哦。"]}}]},zh_TW:{childViews:[{type:"ModalAlert",options:{markdowns:["## Branch Spaghetti","","哇塞大神！這關我們要來點不同的！","","現在我們的 `master` branch 是比 `one` `two` 和 `three` 這三個 branch 多了幾個 commit。由於某種原因，我們需要將 master 所新增的幾個 commit 套用到其它三個 branch 上面。","","`one` branch 需要重新排序和取消 `C5` 這一個 commit， `two` 需要完全重排，而 `three` 只需要再一個 commit。","","我們會讓你知道如何解決這個問題，之後請記得用 `show solution` 看看我們的答案喔。"]}}]},ko:{childViews:[{type:"ModalAlert",options:{markdowns:["## 브랜치 스파게티","","음, 이번에는 만만치 않습니다!","","여기 `master` 브랜치의 몇 번 이전 커밋에 `one`, `two`,`three` 총 3개의 브랜치가 있습니다. 어떤 이유인지는 몰라도, master의 최근 커밋 몇 개를 나머지 세 개의 브랜치에 반영하려고 합니다.","","`one` 브랜치는 순서를 바꾸고 `C5`커밋을 삭제하고, `two`브랜치는 순서만 바꾸며, `three`브랜치는 하나의 커밋만 가져옵시다!","","자유롭게 이 문제를 풀어보시고 나서 `show solution`명령어로 모범 답안을 확인해보세요."]}}]},ru_RU:{childViews:[{type:"ModalAlert",options:{markdowns:["## Спутанные ветки","","УОУ! В этом уровне придётся попотеть!","","У нас тут по несколько коммитов в ветках `one`, `two` и `three`. Не важно почему, но нам надо видоизменить эти три ветки при помощи более поздних коммитов из ветки `master`.","","Ветка `one` нуждается в изменении порядка и удалении `C5`. `two` требует полного перемешивания, а `three` хочет получить только один коммит","","Как пройти этот уровень – решать тебе, а как найдёшь решение – сравни его с нашим при помощи `show solution`."]}}]},uk:{childViews:[{type:"ModalAlert",options:{markdowns:["## Макарони з гілок","","Ооо Неля! Ну й завданнячко.","","Ми маємо гілку `master`, яка на кілька комітів попереду гілок `one`, `two` та `three`. З незрозумілих причин, нам потрібно оновити ці гілки більш пізніми змінами з мастеру.","","Гілку `one` потрібно впорядкувати і видалити `C5`. Гілку `two` також потрібно впорядкувати, а в гілку `three` потрібно додати ще один коміт!","","Ми повністю покладаємось на тебе -- порівняй свій розв’зок з нашим, який можна подивитись командою `show solution`. "]}}]},vi:{childViews:[{type:"ModalAlert",options:{markdowns:["## Nhánh rối như canh hẹ","","Chààà, anh bạn! Thử thách lần này hơi khoai đây.","","Hiện tại thì nhánh `master` đang có nhiều commit hơn các nhánh `one`, `two` và `three`. Vì một lý do nào đó, ta cần cập nhật những commit trên nhánh `master` lên các nhánh còn lại kèm với một vài điều chỉnh .","","Nhánh `one` thì cần sắp xếp lại và xóa commit `C5`, trong khi đó nhánh `two` thì đơn giản sắp xếp, còn `three` thì chỉ cần một commit!","","Cố gắng động não tìm ra cách đi nhé -- khi bạn làm xong thì nhớ so sánh với đáp án của chúng tôi bằng lệnh `show solution`. "]}}]}}}},{}],131:[function(e,t,o){o.level={goalTreeString:'{"branches":{"master":{"target":"C1","id":"master","remoteTrackingBranchID":"o/master"},"o/master":{"target":"C1","id":"o/master","remoteTrackingBranchID":null}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"}},"HEAD":{"target":"master","id":"HEAD"},"originTree":{"branches":{"master":{"target":"C1","id":"master","remoteTrackingBranchID":null}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"}},"HEAD":{"target":"master","id":"HEAD"}}}',solutionCommand:"git clone",name:{en_US:"Clone Intro",fr_FR:"Introduction à clone",de_DE:"Clone Einführung",ja:"Clone入門",es_AR:"Introducción a clone",es_ES:"Introducción a clone",pt_BR:"Introdução à clonagem",gl:"Introducción a clone",zh_CN:"Git Clone",zh_TW:"介紹 clone",ru_RU:"Введение в клонирование",ko:"Clone 소개",uk:"Знайомство з clone",vi:"Giới thiệu về clone"},hint:{en_US:"Just git clone!",fr_FR:"Simplement git clone !",de_DE:"Einfach git clone ausführen!",ja:"単にgit clone!",zh_CN:"只要 git clone 就可以了!",es_AR:"Simplemente hacé git clone!",es_ES:"¡Simplemente escribe `git clone`!",pt_BR:"Basta fazer um git clone!",gl:"¡Chega con facer git clone!",zh_TW:"只要 git clone 就好了",ru_RU:"Простой git clone!",ko:"그냥 git clone 하세요!",uk:"Просто git clone!",vi:"Đơn giản là `git clone`!"},startDialog:{en_US:{childViews:[{type:"ModalAlert",options:{markdowns:["## Git Remotes","","Remote repositories aren't actually that complicated. In today's world of cloud computing it's easy to think that there's a lot of magic behind git remotes, but they are actually just copies of your repository on another computer. You can typically talk to this other computer through the Internet, which allows you to transfer commits back and forth.","","That being said, remote repositories have a bunch of great properties:","","- First and foremost, remotes serve as a great backup! Local git repositories have the ability to restore files to a previous state (as you know), but all that information is stored locally. By having copies of your git repository on other computers, you can lose all your local data and still pick up where you left off.","","- More importantly, remotes make coding social! Now that a copy of your project is hosted elsewhere, your friends can contribute to your project (or pull in your latest changes) very easily.","","It's become very popular to use websites that visualize activity around remote repos (like [Github](https://github.com/) or [Phabricator](http://phabricator.org/)), but remote repositories _always_ serve as the underlying backbone for these tools. So it's important to understand them!"]}},{type:"ModalAlert",options:{markdowns:["## Our Command to create remotes","","Up until this point, Learn Git Branching has focused on teaching the basics of _local_ repository work (branching, merging, rebasing, etc). However now that we want to learn about remote repository work, we need a command to set up the environment for those lessons. `git clone` will be that command","","Technically, `git clone` in the real world is the command you'll use to create _local_ copies of remote repositories (from github for example). We use this command a bit differently in Learn Git Branching though -- `git clone` actually makes a remote repository out of your local one. Sure it's technically the opposite meaning of the real command, but it helps build the connection between cloning and remote repository work, so let's just run with it for now.",""]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Lets start slow and just look at what a remote repository looks like (in our visualization).",""],afterMarkdowns:["There it is! Now we have a remote repository of our project. It looks pretty similar except for some visual changes to make the distinction apparent -- in later levels you'll get to see how we share work across these repositories."],command:"git clone",beforeCommand:""}},{type:"ModalAlert",options:{markdowns:["To finish this level, simply `git clone` your existing repository. The real learning will come in following lessons."]}}]},fr_FR:{childViews:[{type:"ModalAlert",options:{markdowns:["## Git Remotes","","Les dépôts distants (remote repositories) ne sont pas si compliqués que ça. Dans l'ère actuelle du cloud computing il est facile de croire qu'il y a un peu de magie derrière les branches distantes, mais elles sont en fait juste des copies de votre dépôt local sur un autre ordinateur. Vous pouvez donc vous connecter à cet ordinateur par Internet, ce qui vous permet de transférer les commits en retard et en avance.","","Cela dit, les branches distantes ont plusieurs propriétés puissantes :","","- Avant toute chose, le dépôt distant sert de sauvegarde ! Le dépôt local de git a la capacité de restaurer des fichiers à un état précédent (comme vous le savez), mais toutes les informations sont stockées localement. En ayant des copies de votre dépôt git sur d'autres ordinateurs, vous pouvez perdre vos données et toujours repartir de là où vous en étiez resté.","","- Plus important encore, les dépôts distants sociabilisent le projet ! Maintenant qu'il est hébergé quelque part ailleurs, vos amis peuvent y contribuer facilement (ou récupérer vos derniers changements).","","Il est devenu courant de visualiser l'activité sur dépôt distant via des sites internet (comme [Github](https://github.com/) ou [Phabricator](http://phabricator.org/)), mais les dépôts distants servent _toujours_ de colonne vertébrale à ce système. C'est donc important de les comprendre !"]}},{type:"ModalAlert",options:{markdowns:["## Les commandes pour créer des dépôts distants","","Jusqu'à maintenant, Learn Git Branching s'est surtout concentré sur l'apprentissage des bases du travail sur un dépôt _local_ (branch, merge, rebase, etc). Cependant maintenant nous voulons savoir comment travailler sur les dépôts distants, nous avons besoin d'une commande pour l'environnement de ces leçons. `git clone` sera cette commande.","","Techniquement, `git clone` dans le monde réel sera la commande que vous utiliserez pour créer des copies _locales_ des dépôts distants (de github par exemple). Nous utilisons cette commande un peu différemment dans Learn Git Branching car `git clone` crée ici un dépôt distant à partir de votre dépôt local. Il est certain qu'il s'agit donc du sens opposé de la commande originale, mais cela aide à construire la connexion entre le clonage et le travail sur le dépôt distant, travaillons donc avec cela pour l'instant.",""]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Commençons doucement et regardons à quoi ressemble un dépôt distant (dans notre visualisation).",""],afterMarkdowns:["Nous y sommes ! Maintenant nous avons un dépôt distant de notre projet. Cela ressemble fortement à d'habitude, en dehors de quelques changements pour rendre compte des différences -- dans les niveaux suivants vous allez voir comment partager le travail entre ces dépôts."],command:"git clone",beforeCommand:""}},{type:"ModalAlert",options:{markdowns:["Pour finir ce niveau, faites simplement un `git clone` du dépôt existant. Le réel apprentissage arrivera dans les prochaines leçons."]}}]},es_AR:{childViews:[{type:"ModalAlert",options:{markdowns:["## Git Remotes","","Los repositorios remotos no son _tan_ complicados. En el mundo actual de la computación en la nube es bastante facil pensar que hay un montón de magia detrás de los remotes de git, pero en realidad sólo son copias de tu repositorio en otra computadora. Típicamente vas a hablar con esta otra computadora a través de Internet, lo que permite transferir commits de un lado a otro.","","Habiendo dicho eso, los repositorios remotos tienen un par de propiedades copadas:","","- Primero y principal, los remotos ¡son un genial backup! Los repositorios locales de git tienen la habilidad de restaurar archivos a un estado previo (como ya sabés), pero toda esa información está almacenada localmente. Al tener copias de tu repositorio git en otras computadoras, podés perder todos tus datos locales y aún así retomar de donde habías dejado.","","- Más importante, ¡los remotos sociabilizan la programación! Ahora que hay una copia de tu proyecto hosteada en otro lugar, tus amigos pueden contribuir a tu proyecto (o bajarse los últimos cambios) de un modo muy sencillo.","","Se volvió bastante popular el uso de sitios web que muestran la actividad de los repositorios (como [Github](https://github.com/) o [Phabricator](http://phabricator.org/)), pero esos repositorios remotos _siempre_ sirven como la base subyacente de esas herramientas. Así que ¡es importante entenderlos!"]}},{type:"ModalAlert",options:{markdowns:["## Nuestro comando para crear remotos","","Hasta este punto, Learn Git Branching se centró en enseñar las bases del trabajo _local_ con repositorios (branchear, mergear, rebasear, etc). Sin embargo, ahora que queremos aprender sobre el trabajo con repositorios remotos, necesitamos un comando para inicializar nuestro entorno para esas lecciones. Ese comando será `git clone`","","Técnicamente, `git clone` en el mundo real es el comando que usarías para crear copias _locales_ de un repositorio remoto (uno de GitHub, por ejemplo). Acá usamos este comando de un modo un tanto distinto, en cambio -- `git clone` va a crear un repositorio remoto a partir del tuyo local. Estamos de acuerdo en que es el significado técnicamente opuesto al del comando real, pero ayuda bastante a entender la conexión entre el clonado y el trabajo en un repositorio remoto, así que vamos a vivir con ello por ahora.",""]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Comencemos despacio y simplemente veamos cómo se ve un repositorio remoto en nuestra visualización.",""],afterMarkdowns:["¡Ahí está! Ahora tenemos un repositorio remoto de nuestro proyecto. Parece bastante similar, salvando algunos cambios visuales para hacer evidente la distinción -- en niveles posteriores vas a ver cómo compartir trabajo entre estos repositorios."],command:"git clone",beforeCommand:""}},{type:"ModalAlert",options:{markdowns:["Para completar este nivel, simplemente hacé `git clone` de tu repositorio existente. El verdadero aprendizaje viene en las próximas lecciones."]}}]},es_ES:{childViews:[{type:"ModalAlert",options:{markdowns:["## Git Remotes","","Los repositorios remotos no son _tan_ complicados. En el mundo actual de la computación en la nube es bastante facil pensar que hay un montón de magia detrás de los remotes de git, pero en realidad sólo son copias de tu repositorio en otra computadora. Típicamente vas a hablar con esta otra computadora a través de Internet, lo que permite transferir commits de un lado a otro.","","Habiendo dicho eso, los repositorios remotos tienen un par de propiedades interesantes:","","- Primero y principal, los remotos ¡son un backup genial! Los repositorios locales de git tienen la habilidad de restaurar archivos a un estado previo (como ya sabes), pero toda esa información se encuentra almacenada localmente. Al tener copias de tu repositorio git en otras computadoras, puedes perder todos tus datos locales y aún así retomar el trabajo en el punto donde lo habías dejado.","","- Más importante, ¡los remotos sociabilizan la programación! Ahora que hay una copia de tu proyecto hosteada en otro lugar, tus amigos pueden contribuir a tu proyecto (o bajarse los últimos cambios) de un modo muy sencillo.","","Se volvió bastante popular el uso de sitios web que muestran la actividad de los repositorios (como [Github](https://github.com/) or [Phabricator](http://phabricator.org/)), pero esos repositorios remotos _siempre_ sirven como la base subyacente de esas herramientas. Así que ¡es importante entenderlos!"]}},{type:"ModalAlert",options:{markdowns:["## Nuestro comando para crear remotos","","Hasta este punto, Learn Git Branching se centró en enseñar las bases del trabajo _local_ con repositorios (crear ramas, mergear, rebasear, etc). Sin embargo, ahora que queremos aprender sobre el trabajo con repositorios remotos, necesitamos un comando para inicializar nuestro entorno para esas lecciones. Ese comando será `git clone`","","Técnicamente, `git clone` en el mundo real es el comando que usarías para crear copias _locales_ de un repositorio remoto (uno de GitHub, por ejemplo). Aquí usamos este comando de un modo un tanto distinto, en cambio -- `git clone` va a crear un repositorio remoto a partir del tuyo local. Estamos de acuerdo en que es el significado técnicamente opuesto al del comando real, pero ayuda bastante a entender la conexión entre el clonado y el trabajo en un repositorio remoto, así que vamos a vivir con ello por ahora.",""]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Comencemos despacio y simplemente veamos cómo se ve un repositorio remoto en nuestra visualización.",""],afterMarkdowns:["¡Ahí está! Ahora tenemos un repositorio remoto de nuestro proyecto. Parece bastante similar, salvando algunos cambios visuales para hacer evidente la distinción -- en niveles posteriores vas a ver cómo compartir trabajo entre estos repositorios."],command:"git clone",beforeCommand:""}},{type:"ModalAlert",options:{markdowns:["Para completar este nivel, simplemente ejecuta `git clone` en tu repositorio existente. El verdadero aprendizaje viene en las próximas lecciones."]}}]},pt_BR:{childViews:[{type:"ModalAlert",options:{markdowns:["## Remotos no Git","","Repositórios remotos não são algo muito complicado. Nos dias atuais de computação em nuvem, seria fácil pensar que existiria muita mágica por trás dos remotos do Git, mas não é o caso -- eles são na verdade apenas cópias do seu repositório em outro computador. Você pode geralmente comunicar-se com esse outro computador por meio da Internet, o que permite que você transfira commits de um lado para o outro.","","Tendo dito isto, repositórios remotos tem uma série de propriedades interessantes:","","- Primeiro e antes de tudo, repositórios remotos servem como um ótimo backup! Repositórios Git locais possuem a habilidade de restaurar um arquivo para um estado anterior (como você sabe), mas toda a informação está guardada localmente. Tendo cópias do seu repositório Git em outros computadores, mesmo se você perder todos os seus dados locais, ainda terá como recomeçar do mesmo ponto de onde você tinha parado.","","- Ainda mais importante, repositórios remotos tornam o desenvolvimento uma atividade social! Agora que uma cópia do seu projeto está hospedada em outro lugar, seus amigos podem contribuir para o seu projeto (ou obter as suas últimas alterações) de uma forma bastante simples.","","Está se tornando bastante popular o uso de websites para visualizar a atividade em repositórios (como o [Github](https://github.com/) ou o [Phabricator](http://phabricator.org/)), mas o recurso de repositórios remotos _sempre_ serve como mecanismo base para essas ferramentas. Então é importante entender como ele funciona!"]}},{type:"ModalAlert",options:{markdowns:["## Nosso comando para criar remotos","","Até este ponto, o Learn Git Branching focou em ensinar o básico a respeito de trabalho em repositórios _locais_ (branch, merge, rebase, etc). Entretanto, agora que queremos aprender como repositórios remotos funcionam, precisamos de um comando para configurar o ambiente para essas lições. Esse comando será o `git clone`.","","Tecnicamente, o `git clone` do mundo real é um comando que se usa para criar cópias _locais_  de repositório remotos (do GitHub para o seu computador, por exemplo). Todavia, por motivos logísticos, nós usaremos esse comando de uma forma um pouco diferente no Learn Git Branching -- aqui o `git clone` criará um repositório remoto a partir do repositório local. Certamente, esse comportamento é exatamente o oposto do comando real, mas apesar disso ele ajuda a formar a conexão mental entre a clonagem e a forma como repositórios remotos funcionam, então vamos usá-lo dessa forma mesmo por enquanto.",""]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Vamos começar devagar e apenas olhar como um repositório remoto se parece na nossa visualização.",""],afterMarkdowns:["Aqui está ele! Agora temos um repositório remoto do nosso projeto. Ele é muito parecido exceto por algumas mudanças visuais para tornar a distinção factível -- nas tarefas a seguir veremos como compartilhar trabalho entre esses repositórios."],command:"git clone",beforeCommand:""}},{type:"ModalAlert",options:{markdowns:["Para completar este nível, simplesmente chame o comando `git clone`. Você aprenderá algo de verdade somente nas próximas lições."]}}]},gl:{childViews:[{type:"ModalAlert",options:{markdowns:["## Repositorios remotos en Git","","Os repositorios remotos non son complicados en git. Actualmente ca computación na nube, pódese pensar que hai moita maxia tras os repositorios remotos de git, pero para nada é así -- en verdade son copias do repositorio, pero noutra máquina. Ti podes comunicarte xeralmente con esa outra máquina por medio de internet, o que permite que mandes commits de un repositorio cara o outro.","","Dito isto, os repositorios remotos teñen propiedades interesantes:","","- Primeiro e antes de todo, os repositorios remotos serven como unha copia de seguranza! Os repositorios locais posúen a habilidade de restaurar un arquivo nun estado anterior (como xa sabes), pero toda á información está gardada. Tendo copias do repositorio noutras máquinas, incluso poderías perder tódolos datos da túa computadora, e comenzar a traballar no punto onde o deixaches no último commit.","","- Máis importante aún, ¡os repositorios remotos fan que o desenvolvemento sexa social! Agora que existe unha copia do teu código noutro lugar, os teus amigos poden contribuír no teu proxecto (ou obter os últimos cambios) dunha forma moi simple.","","Hai webs moi populares onde se pode ver a actividade dos repositorios (como [Github](https://github.com/) ou [Phabricator](http://phabricator.org/)), pero estes recursos remotos _sempre_ axudan como mecanismo de base para esas ferramentas. ¡Entón é importante saber cómo funcionan!"]}},{type:"ModalAlert",options:{markdowns:["## O noso comando para crear remotos","","Ata este punto, Learn Git Branching enfocouse en ensinar o básico respecto do traballo en repositorios _locais_ (branch, merge, rebase, etc). Entretanto, agora que queremos aprender como os repositorios remotos funcionan, precisamos dun comando para configurar o entorno para esas leccións. Este comando será `git clone`.","","Técnicamente, `git clone` no mundo real é un comando que fai copias _locais_ de repositório remotos (de GitHub para a túa máquina, por exemplo). Todavía, por motivos loxísticos, nós usaremos ese comando dunha forma un pouco diferente, Learn Git Branching -- aquí `git clone` creará un repositorio remoto a partir do repositorio local. Certamente, ese comportamento é exactamente o oposto do comando real, pero a pesares de iso axudarate a formar unha conexión mental entre a clonación e como funcionan os repositorios remotos, entón imos usalo desa forma.",""]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Imos comenzar a modo, e só ollar cómo un repositorio remoto semellase á nosa visualización.",""],afterMarkdowns:["¡Aquí o tes! Agora temos un respositorio remoto do noso proxecto. El é moi parecido exceto por algúns cambios visuais para ter a unha distinción visible -- nas tarefas a seguir veremos como compartir o traballo entre eses repositorios."],command:"git clone",beforeCommand:""}},{type:"ModalAlert",options:{markdowns:["Para completar este nivel, escribe o comando `git clone`. Aprenderás algo de verdade sóamente nas próximas leccións."]}}]},zh_TW:{childViews:[{type:"ModalAlert",options:{markdowns:["## Git Remotes","","remote (遠端) repository 並不會很難了解. 藉由現在的雲端運算，可以很輕易地了解到在 git remote 裡面有很多有趣的事情，但它們其實其實就只是你的或者是其它電腦上的 repository 的副本。你可以輕易地透過網路去發送你的 commit 給其它的電腦。","","也就是說，remote repository 有很多有趣的地方：","","- 第一，remote 是用來備份的! 本地端的 git 有能力可以回復文件到前一個狀態 (你知道的)，但是全部的資訊還是儲存在本地端。如果你在其它的電腦上面有你的 git repository 的副本，則你可以在資料不小心遺失的時候進行救援備份","","- 更重要的是, remote 讓大家一起來 coding！現在你的 project 放在 remote 上面，你的朋友可以很容易地對你的 project 做出貢獻（或者是 pull 你最後的修改） 。","","使用網站去對 remote repository 做視覺化非常流行（例如 [Github](https://github.com/） 或者是 [Phabricator]（http://phabricator.org/）），但這背後最大的功臣是 remote repository，因此我們務必要了解它。"]}},{type:"ModalAlert",options:{markdowns:["## 我們去建立 remotes 的指令","","到目前為止，Learn Git Branching 著重在解釋本地端的工作（branching, merging, rebasing 以及其它指令）， 但是我們現在想要學習針對 remote 的指令，我們需要一個指令去建立環境，`git clone` 就是我們需要的指令","","技術上來說， `git clone` 表示你想要把遠端的 repository 複製一份下來放在本地端（ 例如從 github 複製）。 雖然 `git clone` 實際上是把遠端的 repository 複製下來放在本地端，在 Learn Git Branching 中，我們用的這個指令會有一點不同。雖然他跟真實的指令的意思相反，但是它可以建立起本地端以及遠端的一個連結，現在讓我們看看如何使用它吧。",""]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["讓我們慢慢來，並且看看 remote repository 是長什麼樣子（在我們的視覺化圖形中）。",""],afterMarkdowns:["就是那樣！現在我們有了一個放置了我們 project 的 remote repository。除了一些視覺上的改變之外，它們看起來很像，在之後的關卡中你就會看到我們如何分享我們的工作到這些 repository 上面。"],command:"git clone",beforeCommand:""}},{type:"ModalAlert",options:{markdowns:["要完成這個關卡，只要打 `git clone，其它的學習會在後面的關卡中出現。"]}}]},zh_CN:{childViews:[{type:"ModalAlert",options:{markdowns:["## 远程仓库","","远程仓库并不复杂, 在如今的云计算盛行的世界很容易把远程仓库想象成一个富有魔力的东西, 但实际上它们只是你的仓库在另个一台计算机上的拷贝。你可以通过因特网与这台计算机通信 —— 也就是增加或是获取提交记录","","话虽如此, 远程仓库却有一系列强大的特性","","- 首先也是最重要的的点, 远程仓库是一个强大的备份。本地仓库也有恢复文件到指定版本的能力, 但所有的信息都是保存在本地的。有了远程仓库以后，即使丢失了本地所有数据, 你仍可以通过远程仓库拿回你丢失的数据。","","- 还有就是, 远程让代码社交化了! 既然你的项目被托管到别的地方了, 你的朋友可以更容易地为你的项目做贡献(或者拉取最新的变更)","","现在用网站来对远程仓库进行可视化操作变得越发流行了(像 [Github](https://github.com/) 或 [Phabricator](http://phabricator.org/)), 但远程仓库**永远**是这些工具的顶梁柱, 因此理解其概念非常的重要!"]}},{type:"ModalAlert",options:{markdowns:["## 我们创建远程仓库的命令","","直到现在, 教程都聚焦于**本地**仓库的操作（branch、merge、rebase 等等）。但我们现在需要学习远程仓库的操作 —— 我们需要一个配置这种环境的命令, 它就是 `git clone`。","从技术上来讲，`git clone` 命令在真实的环境下的作用是在**本地**创建一个远程仓库的拷贝（比如从 github.com）。 但在我们的教程中使用这个命令会有一些不同 —— 它会在远程创建一个你本地仓库的副本。显然这和真实命令的意思刚好相反，但是它帮咱们把本地仓库和远程仓库关联到了一起，在教程中就凑合着用吧。",""]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["咱们慢慢来，先看看远程仓库（在图示中）的样子。",""],afterMarkdowns:["就是它了! 现在我们有了一个自己项目的远程仓库。除了远程仓库使用虚线之外, 它们几乎没有什么差别 —— 在后面的关卡中, 你将会学习怎样在本地仓库和远程仓库间分享工作成果。"],command:"git clone",beforeCommand:""}},{type:"ModalAlert",options:{markdowns:["要完成本关, 用 `git clone` 复制下你的仓库就可以了。后续的课程我们会正式地学习"]}}]},de_DE:{childViews:[{type:"ModalAlert",options:{markdowns:["## Git Remotes","","Entfernte Repositorys sind nicht weiter kompliziert. In dieser Welt des Cloud Computings könnte man vielleicht glauben, dass hinter entfernten Git-Repositorys eine Menge Magie steckt, aber es sind einfach nur Kopien eines Repositorys auf einem anderen Rechner. Du kannst mit diesem Rechner typischerweise über das Internet kommunizieren, was es dir ermöglicht Commits hin und her zu schicken.","","Nichts desto weniger haben entfernte Repositorys eine Menge toller Eigenschaften:","","- Vor allem: sie sind ein super Backup! Lokale Git-Repositorys können deine Arbeitskopie ein jeden beliebigen früheren Zustand versetzen (wie du ja weißt), aber all diese Informationen liegen eben bei dir lokal. Wenn es Kopien von deinem Repository auf anderen Rechnern gibt, kannst du ruhig all deine Daten verlieren und trotzdem genau da weitermachen, wo du aufgehört hast.","","- Noch wichtiger: Remotes geben dem Entwickeln eine soziale Komponente! Wenn eine Kopie deines Projekts woanders liegt können deine Freunde sehr einfach etwas zu dem Projekt beitragen (oder sich deine neuesten Änderungen holen).","","Websites, die die Aktivitäten um diese entfernten Repositorys darstellen (wie [Github](https://github.com/) oder [Phabricator](http://phabricator.org/)) erfreuen sich zunehmender Beliebtheit, aber entfernte Repositorys sind _immer_ das Rückgrat für diese Werkzeuge. Deshalb ist es wichtig, sie zu verstehen."]}},{type:"ModalAlert",options:{markdowns:["## Der Befehl um ein Remote zu erstellen","","Bis jetzt hat sich Learn Git Branching darauf konzentriert, die Grundlagen der _lokalen_ Arbeit mit Repositorys zu vermitteln (Branche anlegen, zusammenführen, Rebasen etc). Jetzt wollen wir allerdings lernen mit entfernten Repositorys zu arbeiten und brauchen für die Level eine entsprechende Umgebung. Die schaffen wir mit `git clone`.","",'In der Realität ist `git clone` eigentlich der Befehl, mit dem du eine _lokale_ Kopie eines _entfernten_ Repositorys erstellst (das zum Beispiel auf Github liegt). Wir benutzen diesen Befehl in Learn Git Branching allerdings ein wenig anders -- hier macht `git clone` tatsächlich eine Kopie von deinem lokalen Repository auf einem "entfernten Server". Klar, das ist eigentlich genau das Gegenteil von dem was der echte Befehl macht, aber es hilft den Zusammenhang zwischen Cloning und der Arbeit mit entfernten Repositorys herzustellen, also machen wir\'s einfach so.',""]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Fangen wir langsam an und schauen nur wie ein entferntes Repository in unserer Darstellung aussieht.",""],afterMarkdowns:["Da ist es! Jetzt haben wir ein entferntes Repository unseres Projektes. Es sieht so aus wie das lokale, nur mit ein paar Änderungen in der Darstellung -- in späteren Leveln wirst du sehen, wie man Änderungen zwischen den Repositorys austauschen kann."],command:"git clone",beforeCommand:""}},{type:"ModalAlert",options:{markdowns:["Um diesen Level abzuschließen führ einfach `git clone` auf deinem bestehenden Repository aus. Alles weitere kommt in den nächsten Leveln."]}}]},ja:{childViews:[{type:"ModalAlert",options:{markdowns:["## Gitリモート","","リモートのリポジトリというのはそんなに複雑なものでもありません。クラウドコンピューティングが普及している現在の世界では、gitリモートの裏には何か不思議な仕組みが動いていると思いやすいのですが、実は別のコンピュータ上に保存されているあなたのリポジトリのコピーにすぎません。通常、インターネットを媒体に使って別のコンピュータと対話し、コミットを交互にやり取りすることができます。","","とはいえ、リモートリポジトリにはいくつかの素晴らしい特徴があります:","","- まず、リモートはバックアップの役割を果たします。ご存知の通り、ローカルのgitリポジトリは以前の状態にファイルを復帰する機能を持っているのですが、その情報はすべてローカルに保存されています。gitリポジトリを別のコンピュータにも保存することで、ローカルのデータがすべて失われたとしても、保存状態からコーディングを続けられます。","","- それよりも大切なこととして、リモートではコードをより一般的に公開できます！プロジェクトのコピーが別の場所に保存されているため、友達などが簡単にそのプロジェクトに参加したり最近の変更をpullしたりできます。","","最近ではリモートリポジトリに関するデータをビジュアル的に表示するウェブサイト([Github](https://github.com/)や[Phabricator](http://phabricator.org/)など)の使用が人気を集めていますが、リモートリポジトリは_そのいずれの_ウェブサイトの裏にも使われています。なので理解する必要があります。"]}},{type:"ModalAlert",options:{markdowns:["## リモートを作成するコマンド","","今までLearn Git Branchingでは_ローカル_リポジトリの様々な作業（branch, merge, rebaseなど）に焦点を当ててきました。しかし、これからはリモートリポジトリの作業を学びますので、レッスンのために環境をセットアップする必要があります。そのコマンドは`git clone`になります。","","通常、`git clone`はリモートリポジトリ（githubなどから）を_ローカル_にコピーする時に使います。しかしLearn Git Branchingでは少し違ったように使います -- ここでは`git clone`が_ローカルリポジトリ_をリモートにコピーします。本当のコマンドの逆の動作になっているのですが、学んでいくうちにcloneとリモートリポジトリのつながりが見えてくるはずです。なので、今はとりあえず例として使ってみましょう。",""]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["最初の一歩として、ビジュアライズでリモートリポジトリを見てみましょう。",""],afterMarkdowns:["できました! プロジェクトのリモートリポジトリが保存されました。結構似ているのですが、その違いを明らかにするために少しだけビジュアルを工夫しました -- これからのレベルではこれらのリポジトリの間で作業をどう共有するか見ていきます。"],command:"git clone",beforeCommand:""}},{type:"ModalAlert",options:{markdowns:["このレベルをクリアするには、`git clone`で既存のリポジトリのクローンを作成します。次のレッスンでより詳細に見ていきます。"]}}]},ru_RU:{childViews:[{type:"ModalAlert",options:{markdowns:["## Удалённые репозитории в Git","","На самом деле удалённые репозитории в Git не так сложны, как кажутся на первый взгляд. Кажется, что в современном мире облачных вычислений под термином «удалённый репозиторий» подразумевается что-то сложное и загадочное. Однако, удалённые репозитории — это всего-навсего копии вашего репозитория, хранящиеся на другом компьютере. Обычно вы можете связываться с этим другим компьютером через Интернет, что позволяет вам передавать коммиты туда и сюда.","","Как уже было сказано, удалённые репозитории обладают рядом замечательных свойств:","","- В первую очередь, удалённые репозитории - это замечательное средство резервного копирования! Насколько вам известно, локальные репозитории способны восстанавливать файлы, используя предыдущие состояния, но вся эта информация хранится локально. Потеряв все свои локальные данные, вы способны восстановить их при наличии копии своего репозитория на другом компьютере.","","- Что ещё более важно, удалённые репозитории позволяют сделать процесс разработки более социальным! Теперь, когда копия вашего проекта размещена в другом месте, ваши друзья запросто могут внести свой вклад в ваш проект или забрать последние и актуальные изменения.","","Набирает популярность использование web-сайтов для визуализации активности удалённых репозиториев (например, [GitHub](https://github.com/) или [Phabricator](http://phabricator.org/)), однако удалённые репозитории _всегда_ выступают в качестве базы для таких инструментов. Поэтому так важно понимать, как устроены удалённые репозитории!"]}},{type:"ModalAlert",options:{markdowns:["## Наша команда для создания удалённого репозитория","","До настоящего момента мы были сфокусированы на изучении основ работы с _локальным_ репозиторием (ветвление, слияние, перемещение и т.д.). Однако теперь, когда мы хотим научиться работать с удалёнными репозиториями, нам нужны новые команды для настройки рабочей среды для этих упражнений. Такой командой нам послужит `git clone`","","Технически, `git clone` в реальной жизни - это команда, которая создаст _локальную_ копию удалённого репозитория (например, с GitHub). На наших занятиях в Learn Git Branching мы используем эту команду немного иначе - `git clone` создаёт удалённый репозиторий на основе вашего локального репозитория. На самом деле, это является полной противоположностью реальной команды, однако такой подход поможет нам наладить связь между склонированным и удалённым репозиторием. Давайте просто запустим эту команду.",""]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Давайте начнём постепенное изучение и взглянем на то, что собой представляет удалённый репозиторий (в нашем представлении).",""],afterMarkdowns:["Вот так! Теперь у нас есть удалённый репозиторий нашего проекта. Выглядит всё довольно одинаковым за исключением некоторых визуальных различий - в последующих уровнях вы увидите, как мы разделяем работу по этим репозиториям."],command:"git clone",beforeCommand:""}},{type:"ModalAlert",options:{markdowns:["Чтобы завершить уровень, просто выполните `git clone` на своём существующем репозитории. Настоящее обучение появится в последующих уроках."]}}]},ko:{childViews:[{type:"ModalAlert",options:{markdowns:["## Git Remote(원격)","","원격 저장소라는것이 사실 그다지 복잡한 개념은 아닙니다. 오늘날의 클라우드 컴퓨팅을 떠올리면 git remote의 이면에 수많은 마법이 부려지고 있을것 같지만, 사실 git remote 또 하나의 컴퓨터에 있는 여러분의 저장소의 복사본일 뿐입니다. 여러분은 일반적으로 인터넷을 통해서 이 또 하나의 컴퓨터와 커밋을 주고 받는등 대화를 할 수 있습니다.","","소개한김에 자랑까지 하자면 원격 저장소는 수많은 장점들이 있습니다:","","- 무엇보다 먼저, 원격 저장소는 백업으로서의 역할을 훌륭하게 수행합니다! 로컬 git 저장소는 파일들을 이전의 상태로 되돌리는 기능을 가지고 있습니다(아시다시피). 하지만 그 모든 정보가 로컬(내PC)에 저장되어 있습니다. 여러분의 git 저장소를 다른 컴퓨터에 복사본을 가지고있으면 로컬 데이터를 다 잃더라도 다른 컴퓨터에 남아있는 복사본으로 다시 출발 할 수 있습니다.","","- 더 중요한 것은, 원격 저장소를 통해 코딩을 다른 사람들과 함께 할 수 있다는것입니다. 여러분의 프로젝트의 복사본이 어느곳에선가 호스트되기때문에 여러분의 친구가 프로젝트에 아주 쉽게 기여할 수 있게됩니다(최근의 변화를 pull하거나).","","원격 저장소에서의 활동을 시각화해주는 웹 사이트들을 사용하는것이 추세입니다 ([Github](https://github.com/) 또는 [Phabricator](http://phabricator.org/)등이 있습니다). 원격 저장소가 _항상_ 이러한 도구들의 중심 뼈대를 이루고있습니다. 그래서 잘 아는것이 중요해요!"]}},{type:"ModalAlert",options:{markdowns:["## 원격 저장소를 생성하는 명령어","","지금까지, Git 브랜치 배우기는 _로컬_ 저장소가 어떻게 활용되는지에 대해 중점적으로 소개해 왔습니다(브랜치, 합병, 리베이스 등등). 이제 원격 저장소를 어떻게 활용하는지에 대해 배워보려고 합니다. 앞으로 이어질 레슨의 환경을 마련할 명령어가 필요합니다. `git clone`가 바로 그 명령어 입니다.","","실제로 `git clone`은 원격 저장소의 복사본을 _로컬_에 생성할때 사용하는 명령어 입니다(github에서 가져올때 라던가). Git 브랜치 배우기에서는 이 명령어를 살짝 다르게 사용합니다 -- `git clone`이 당신의 로컬 저장소에서 원격 저장소를 생성해냅니다. 물론 실제 명령어와 반대로 작동하는 것이지만 클론과 원격 저장소 사이의 연결관계를 이해하는데 도움이되서 이렇게 했습니다. 일단은 그냥 해봅시다.",""]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["천천히 시작해봅시다. 일단 원격저장소가 우리 시각화 자료에서 어떻게 보이는지부터 봅시다.",""],afterMarkdowns:["자! 이제 우리 프로젝트의 원격 저장소를 가지게 되었습니다. 구분을 하기위해 조금 모양이 다른것 말고는 둘이 똑같게 생긴걸 알 수 있습니다 -- 뒤의 레벨에서는 우리가 이 저장소들 사이에서 어떻게 작업을 공유하는지 알아보겠습니다."],command:"git clone",beforeCommand:""}},{type:"ModalAlert",options:{markdowns:["이 레벨을 통과하기 위해서 `git clone`을 입력하세요. 뒤의 레슨에서 더많은 것들을 배워볼 것입니다."]}}]},uk:{childViews:[{type:"ModalAlert",options:{markdowns:["## Віддалені репозиторії","",'Віддалені репозиторії не є дуже складними. В сучасному світі, де на кожному кроці можна зустріти "хмарні обчислення", може видатися, що концепція віддалених репозиторіїв є дуже складною, але насправді вони -- просто звичайні копії твого репозиторію на віддаленому комп’ютері. Зазвичай з цим віддаленим комп’ютером можна зв’язатися через інтернет, що дозволяє обмінюватись комітами.',"","Приймаючи до уваги все сказане вище, віддалені репозиторії мають купу чудових властивостей:","","- В першу чергу, віддалені сервери -- це завжди чудова резевна копія (бекап)! Локальний репозиторій дає можливість відкотитися до попереднього стану, але вся інформація зберігається локально. Маючи копії свого репозиторію на віддалених машинах, ти можеш пережити втрату жорсткого диску чи пошкодження данних і продовжити працювати з того місця, на якому закінчив.","","- Що не менш важливо, віддалені репозиторії роблять програмування соціальним! Коли копія твого проекту розміщена в мережі, твої друзі мають змогу допомогти твоєму проекту (чи стягнути останні зміни) без зайвих зусиль.","","Стало дуже популярним користуватися веб-сайтами, що візуалізують активність на віддалених репозиторіях (наприклад [Github](https://github.com/) чи [Phabricator](http://phabricator.org/)), але віддалені репозиторії _завжди_ слугують як основа цих сервісів. Тому важливо розуміти їх!"]}},{type:"ModalAlert",options:{markdowns:["## Команда, що створює віддалені репозиторії","","До цього моменту, Learn Git Branching концентрувало увагу на основах роботи з _локальним_ репозиторієм (гілкування, злиття гілок, ребейс, тощо). Однак тепер, коли ми вчимо віддалені репозиторії, нам потрібно налаштувати середовище для подальших уроків. `git clone` впорається з цим завданням.","","В принципі, `git clone` в справжньому git -- це команда для створення _локальної_ копії віддаленого репозиторію (наприклад з github). Але у Learn Git Branching ми використовуватимемо цю команду по-іншому -- `git clone` буде створювати віддалений репозиторій з локального. Я згодний, що це виходить трохи догори-дригом, але це допоможе створити зв’язок в голові між клонуванням та роботою з віддаленми репо, тому поки що будемо використовувати її таким чином.",""]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Низький старт - просто подивімося, як віддалений репозиторій виглядає (в нашій візуалізації).",""],afterMarkdowns:["Ось і все! Тепер ми маємо віддалений репозиторій нашого проекту. Він виглядає досить схоже, хіба що деякі візуальні елементи інші, щоб краще показати різницю -- в наступних рівнях ти навчишся ділитися роботою між цими репозиторіями."],command:"git clone",beforeCommand:""}},{type:"ModalAlert",options:{markdowns:["Щоб пройти цей рівень, просто зроби `git clone` свого поточного репозиторію. Справжні знання ти отримаєш в подальших рівнях."]}}]},vi:{childViews:[{type:"ModalAlert",options:{markdowns:["## Git Remotes(Kho lưu trữ từ xa)","","Thực ra thì kho remote cũng không khó hiểu lắm đâu. Giờ đây đâu đâu cũng thấy điện toán đám mây nên ai ai cũng tưởng git remote nó là cái gì đó ma thuật lắm, nhưng chúng thực ra chỉ là những bản sao chép ko chứa của bạn lên máy tính khác. Bạn có thể giao tiếp với chúng qua internet, tù đó mà chuyển giao commit qua lại.","","Vì lẽ đó mà kho remote có những đặc tính tuyệt vời:","","- Trước hết, có tác dụng như là bản sao dự phòng! Bạn đã biết rằng kho địa phương có thể khôi phục trở lại trạng thái trước đó, nhưng tất cả thông tin đó chỉ được lưu trữ cục bộ. Bằng cách sao chép toàn bộ kho chứa của bạn lên máy tính ở xa, bạn hoàn toàn có thể mất hết dữ liệu tại máy tính mà vẫn tiếp tục làm việc như chưa có gì xảy ra.","","- Quạn trọng hơn nữa, kho remote khiến lập trình có tính cộng đồng hơn! Bây giờ bản sao dự án của bạn đã được lưu trũ ở nơi khác, bạn bè của bạn có thể đóng góp (hoặc kéo về cập nhật mới nhất) dự án của bạn rất dễ dàng.","","Trực quan hóa các kho lưu trữ từ xa bằng cách sử dụng các trang web đang trở nên phổ biến hơn (như [Github] (https://github.com/) hoặc [Photypeator] (http://phovenator.org/)), nhưng các kho lưu trữ từ xa * * Luôn luôn ** là trụ cột của các công cụ này, vì vậy điều quan trọng là phải hiểu khái niệm này!"]}},{type:"ModalAlert",options:{markdowns:["## Câu lệnh của chúng tôi để tạo kho lưu trữ từ xa","","Cho đến bây giờ, Learn Git Branching đã tập trung dạy về làm việc trên kho chứa _địa phương_ (rẽ nhánh `branch`, hợp nhánh `merge`, dịch chuyển nhánh `rebase`, vân vân ...). Nhưng bây giờ ta lại muốn học về làm việc trên kho lưu trữ từ xa, ta cần một câu lệnh để cài đặt môi trường cho những bài học này. Đó là `git clone`","","Về mặt kỹ thuật, thì `git clone` thực tế là câu lệnh dùng để tạo một bản sao chép _địa phương_ của khó chứa từ xa (ví dụ từ github chẳng hạn). Nhưng trong Learn Git Branching ta sẽ dùng câu lệnh này hơi khác biệt một chút -- `git clone` sẽ tạo ra một bản sao chép lên kho lưu trữu từ xa dựa trên kho chứa cục bộ của bạn. Điều này hoàn toàn ngược lại với câu lệnh thực tế, nhưng nó giúp ta nhân bản và làm việc với kho lưu trữ từ xa, nên ta sẽ dùng nó trong quá trình học.",""]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Nào cùng khởi động bằng cách nhìn xem kho lưu trữ từ xa trông như thế nào (trong mô tả của chúng tôi).",""],afterMarkdowns:["Nó đây rồi! Giờ ta đã có kho lưu trữ dự án chúng ta từ xa. Nhìn nó cũng khá tương tự chỉ là được minh họa khác biệt một chút -- đến các cấp độ sau ta sẽ tìm hiểu thêm về cách thức trao đổi nội dung giữa các kho chứa này."],command:"git clone",beforeCommand:""}},{type:"ModalAlert",options:{markdowns:["Để hoàn thành cấp độ này chỉ cần đơn giản gõ lệnh `git clone` để sao chép kho chứa hiện tại. Ta sẽ học sâu hơn ở các bài học sau."]}}]}}}},{}],132:[function(e,t,o){o.level={goalTreeString:'{"branches":{"master":{"target":"C5","id":"master","remoteTrackingBranchID":"o/master","localBranchesThatTrackThis":null},"o/master":{"target":"C3","id":"o/master","remoteTrackingBranchID":null,"localBranchesThatTrackThis":["master"]}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"},"C4":{"parents":["C1"],"id":"C4"},"C2":{"parents":["C1"],"id":"C2"},"C3":{"parents":["C2"],"id":"C3"},"C5":{"parents":["C3","C4"],"id":"C5"}},"HEAD":{"target":"master","id":"HEAD"},"originTree":{"branches":{"master":{"target":"C3","id":"master","remoteTrackingBranchID":null,"localBranchesThatTrackThis":null}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"},"C2":{"parents":["C1"],"id":"C2"},"C3":{"parents":["C2"],"id":"C3"}},"HEAD":{"target":"master","id":"HEAD"}}}',solutionCommand:"git clone;git fakeTeamwork 2;git commit ;git pull",startTree:'{"branches":{"master":{"target":"C1","id":"master","remoteTrackingBranchID":null,"localBranchesThatTrackThis":null}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"}},"HEAD":{"target":"master","id":"HEAD"}}',name:{en_US:"Faking Teamwork",fr_FR:"Simulation du travail d'équipe",de_DE:"Teamarbeit simulieren",ja:"擬似的なチーム作業",es_AR:"Simulando el trabajo en equipo",es_ES:"Simulando el trabajo en equipo",pt_BR:"Simulando trabalho em equipe",gl:"Simulando o traballo no repositorio",zh_CN:"模拟团队合作",zh_TW:"模擬團隊合作",ru_RU:"Коллективная работа",uk:"Симуляція колективної роботи",ko:"가짜 팀워크",vi:"Giả lập làm việc nhóm"},hint:{en_US:"remember you can specify the number of commits to fake",fr_FR:"rappelez-vous que vous pouvez spécifier le nombre de commits à simuler",de_DE:"Nicht vergessen, du kannst angeben wieviele Commits simuliert werden sollen.",ja:"擬似的に作成するコミット数を指定できるのをお忘れなく",es_AR:"Acordate que podés especificar cuántos commits simular",es_ES:"Recuerda que puedes especificar cuántos commits simular",pt_BR:"Lembre-se que você pode especificar quantos commits quer simular",gl:"Lembra que podes especifar cantos commits queres simular",zh_CN:"记住你可以指定仿真提交的个数",zh_TW:"你要記得指定要送多少個 commit 出去",ru_RU:"помните, Вы можете указать количество фейковых коммитов",uk:"пам’ятай що ти можеш вказати кількість фейкових комітів",ko:"가장할 커밋의 갯수를 조절할 수 있습니다.",vi:"Nhớ rằng bạn có thể chỉ định số lượng commit để giả lập."},startDialog:{en_US:{childViews:[{type:"ModalAlert",options:{markdowns:["## Simulating collaboration","","So here is the tricky thing -- for some of these upcoming lessons, we need to teach you how to pull down changes that were introduced in the remote.","",'That means we need to essentially "pretend" that the remote was updated by one of your coworkers / friends / collaborators, sometimes on a specific branch or a certain number of commits.',"","In order to do this, we introduced the aptly-named command `git fakeTeamwork`! It's pretty self explanatory, let's see a demo..."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["The default behavior of `fakeTeamwork` is to simply plop down a commit on master"],afterMarkdowns:["There we go -- the remote was updated with a new commit, and we haven't downloaded that commit yet because we haven't run `git fetch`."],command:"git fakeTeamwork",beforeCommand:"git clone"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["You can also specify the number of commits or the branch by appending them to the command"],afterMarkdowns:["With one command we simulated a teammate pushing three commits to the `foo` branch on our remote"],command:"git fakeTeamwork foo 3",beforeCommand:"git branch foo; git clone"}},{type:"ModalAlert",options:{markdowns:["The upcoming levels are going to be pretty difficult, so we're asking more of you for this level.","","Go ahead and make a remote (with `git clone`), fake some changes on that remote, commit yourself, and then pull down those changes. It's like a few lessons in one!"]}}]},fr_FR:{childViews:[{type:"ModalAlert",options:{markdowns:["## Simuler la collaboration","","C'est là que cela devient compliqué : pour certaines des leçons à venir, nous avons besoin de vous enseigner comment récupérer les changements effectués sur le dépôt distant.","",'Cela signifie que nous devons "prétendre" que le dépôt distant a été modifié par un collègue / ami / collaborateur, et parfois même sur une branche spécifique ou avec plusieurs commits.',"","Pour faire cela, nous introduisons à point nommé la commande `git fakeTeamwork` ! Elle devrait vous paraître assez intuitive, voyons une démo..."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Le comportement par défaut de `fakeTeamwork` est tout simplement de faire apparaître un commit sur le master distant :"],afterMarkdowns:["Voilà : le dépôt distant a été mis à jour avec un nouveau commit, et nous n'avons pas encore téléchargé ce commit parce que nous n'avons pas exécuté la commande `git fetch`."],command:"git fakeTeamwork",beforeCommand:"git clone"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Vous pouvez aussi spécifier le nombre de commits ou la branche en les ajoutant à la fin de la commande."],afterMarkdowns:["Avec une seule commande, nous avons simulé un collègue ayant pushé 3 commits sur la branche `foo` de notre dépôt distant"],command:"git fakeTeamwork foo 3",beforeCommand:"git branch foo; git clone"}},{type:"ModalAlert",options:{markdowns:["Les niveaux suivants vont devenir assez difficiles, donc nous augmentons un peu la difficulté de cet exercice.","","Vous devrez créer un dépôt distant (avec `git clone`), simuler quelques changements sur ce dépôt, commiter les vôtres, et enfin appliquer les changements distants dans votre dépôt local (pull). C'est presque plusieurs leçons en une !"]}}]},es_AR:{childViews:[{type:"ModalAlert",options:{markdowns:["## Simulando la colaboración","","Entonces, hay algo medio tramposo acá -- para algunas de las lecciones siguientes, necesitamos explicarte cómo bajar cambios introducidos en el repositorio remoto.","",'Eso significa que esencialmente tenemos que "hacer de cuenta" que el repositorio remoto fue actualizado por algún colega, amigo o colaborador tuyo, incluso a veces en alguna rama específica o una cantidad determinada de commits.',"","Para lograr esto, introdujimos el bien llamado comando ¡`git fakeTeamwork`! Es bastante auto-explicativo: simula trabajo de nuestros colegas. Veamos una demo..."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["El comportamiento por default de `fakeTeamwork` es simplemente crear un commit en master"],afterMarkdowns:["Ahí está: el remoto se actualizó con un nuevo commit, y todavía no nos bajamos ese commit porque aún no hicimos `git fetch`."],command:"git fakeTeamwork",beforeCommand:"git clone"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["También podés especificar la cantidad de commits o la ramma agregándolos al comando"],afterMarkdowns:["Con un único comando simulamos que un compañero de equipo pusheó tres commits a la rama `foo` de nuestro remoto"],command:"git fakeTeamwork foo 3",beforeCommand:"git branch foo; git clone"}},{type:"ModalAlert",options:{markdowns:["Los niveles siguientes van a ser algo difíciles, así que vamos a exigirte un poco más en este nivel.","","Animate y creá un remoto (con `git clone`), simulá algunos cambios en ese remoto, commiteá en tu repo local, y luego pulleate esos cambios. ¡Es como varias lecciones en una!"]}}]},es_ES:{childViews:[{type:"ModalAlert",options:{markdowns:["## Simulando la colaboración","","Entonces, hay algo un poco tramposo -- para algunas de las lecciones siguientes, necesitamos explicarte cómo descargar cambios introducidos en el repositorio remoto.","",'Eso significa que escencialmente tenemos que "tener en cuenta" que el repositorio remoto fue actualizado por algún colega, amigo o colaborador tuyo, incluso a veces en alguna rama específica o una cantidad determinada de commits.',"","Para lograr esto, introdujimos el bien llamado comando ¡`git fakeTeamwork`! Es bastante autoexplicativo: simula trabajo de nuestros colegas. Veamos una demo..."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["El comportamiento por default de `fakeTeamwork` es simplemente crear un commit en master"],afterMarkdowns:["Ahí está: el remoto se actualizó con un nuevo commit, y todavía no nos bajamos ese commit porque aún no hicimos `git fetch`."],command:"git fakeTeamwork",beforeCommand:"git clone"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["También puedes especificar la cantidad de commits o la ramma agregándolos al comando"],afterMarkdowns:["Con un único comando simulamos que un compañero de equipo pusheó tres commits a la rama `foo` de nuestro remoto"],command:"git fakeTeamwork foo 3",beforeCommand:"git branch foo; git clone"}},{type:"ModalAlert",options:{markdowns:["Los niveles siguientes van a ser algo difíciles, así que vamos a exigirte un poco más en este nivel.","","Anímate y crea un remoto (con `git clone`), simula algunos cambios en ese remoto, haz commit en tu repo local, y luego haz pull de esos cambios. ¡Es como si fueran varias lecciones en una!"]}}]},pt_BR:{childViews:[{type:"ModalAlert",options:{markdowns:["## Simulando colaboração","","Neste ponto, temos uma pequena dificuldade -- para algumas das lições a seguir, precisaremos ensinar como fazer pull de mudanças que foram introduzidas no repositório remoto.","",'Isso significa que precisaremos essencialmente "fingir" que o repositório remoto foi atualizado por algum de seus colegas / amigos / colaboradores, algumas vezes em um ramo específico ou com um certo número de commits.',"","Para esta finalidade, criamos o comando fictício `git fakeTeamwork`! Ele é bastante auto-explicativo, vejamos uma demonstração..."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["O comportamento padrão do `fakeTeamwork` é simplesmente fazer aparecer um commit no master"],afterMarkdowns:["Aqui vamos nos -- o repositório remoto foi atualizado com um novo commit, e ainda não baixamos esse commit porque não executamos um `git fetch`."],command:"git fakeTeamwork",beforeCommand:"git clone"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Você também pode especificar o número de commits ou o ramo, anexando-os ao comando"],afterMarkdowns:["Com um único comando, nós simulamos um colega enviando 3 commits para o ramo `foo` do repositório remoto"],command:"git fakeTeamwork foo 3",beforeCommand:"git branch foo; git clone"}},{type:"ModalAlert",options:{markdowns:["Os níveis posteriores serão mais difíceis, então estamos pedindo um pouco mais de você neste nível.","","Vá em frente e crie um repositório remoto (chamando `git clone`), simule algumas mudanças no repositório remoto, commite no repositório local, e então faça um pull das mudanças que haviam sido simuladas. É como se fossem várias lições em uma só!"]}}]},gl:{childViews:[{type:"ModalAlert",options:{markdowns:["## Simulando o traballo no repositorio","","Entón, hai algo con trampa aquí -- para algunhas das leccións  seguintes, precisamos explicarche cómo baixar os cambios introducidos no repositorio remoto.","",'Eso significa que escencialmente temos que "finxir" que o repositorio remoto foi actualizado por algún compañeiro, amigo ou  incluso nalgunha rama específica a cantidade de commits feitos.',"","Para acadar esto, introduxemos o ben chamado comando `git fakeTeamwork`! É bastante auto-explicativo: semella traballo dos nosos colegas. Vexamos una demo..."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["O comportamento por defecto de `fakeTeamwork` é simplemente crear un commit en master na rama remota"],afterMarkdowns:["Ahí o tes: a rama remota actualizouse cun novo commit, e aínda non nos baixamos ese commit porque inda non fixemos `git fetch`."],command:"git fakeTeamwork",beforeCommand:"git clone"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Tamén podes especificar a cantidad de commits ou a rama agregándoos ó comando"],afterMarkdowns:["Cun único comando simulamos que un colega do equipo empurrou tres commits á rama `foo` do noso remoto"],command:"git fakeTeamwork foo 3",beforeCommand:"git branch foo; git clone"}},{type:"ModalAlert",options:{markdowns:["Os niveis seguintes van ser un pouco máis complicados, así que imos a esixirte un pouco máis neste nivel.","","Anímate e crea unha rama remota (con `git clone`), e simula algúns cambios no repositorio remoto, logo desto, fai commit do teu repo local, e logo descarga os cambios. ¡É coma varias leccións nunha soa!"]}}]},zh_TW:{childViews:[{type:"ModalAlert",options:{markdowns:["## 模擬合作","","接下來的課程有一個很難的事情，我們需要讓你學會如何 pull remote 上的更新。","",'這就表示我們必須要 "假裝" remote 被你其中一個同事/ 朋友/ 合作的人在某個特定的 branch 上面送了一些特定的 commit。',"","為了要做到這件事情,我們要介紹一個自己設計的指令 `git fakeTeamwork`！ 從字面上就可以很容易地看出來它在幹嘛，讓我們來看一個範例..."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["`fakeTeamwork` 的預設行為是在送一個 commit 給 master 分支"],afterMarkdowns:["我就說吧！remote 已經藉由一個新的 commit 而更新了，而且因為我們還沒有用 `git fetch`，所以表示我們還沒有下載該 commit。"],command:"git fakeTeamwork",beforeCommand:"git clone"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["你可以在命令的後面指定你要送幾個 commit 或是要送給哪個 branch。"],afterMarkdowns:["我們利用一個指令將三個 commit 送給在 remote 上面的 `foo` branch。"],command:"git fakeTeamwork foo 3",beforeCommand:"git branch foo; git clone"}},{type:"ModalAlert",options:{markdowns:["接下來的關卡會很困難，所以我們在這個關卡中會問你更多問題。","","現在先把 remote 下載下來（利用 `git clone`），假裝送幾個 commit 給 remote 做更新，然後 pull 這些 commit 下來 。這就好像是幾個教學中的指令的總結！"]}}]},zh_CN:{childViews:[{type:"ModalAlert",options:{markdowns:["## 模拟团队合作","","这里有一件棘手的事 —— 为了接下来的课程, 我们需要先教你如何制造远程仓库的变更。","","这意味着，我们需要“假装”你的同事、朋友、合作伙伴更新了远程仓库，有可能是某个特定的分支，或是几个提交记录。","","为了做到这点，我们引入一个自造命令 `git fakeTeamwork`！它的名称已经说明了一切，先看演示.."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["`fakeTeamwork` 默认操作就是在远程仓库的 master 分支上做一次提交。"],afterMarkdowns:["完成了 —— 远程仓库增加了一个新提交，我们还没有下载它，因为我们还没有执行 `git fetch`。"],command:"git fakeTeamwork",beforeCommand:"git clone"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["你还可以指定提交的分支或是数量，只需要在命令后加上它们就可以了。"],afterMarkdowns:["通过一个命令，我们就模拟队友推送了 3 个提交记录到远程仓库的 foo 分支。"],command:"git fakeTeamwork foo 3",beforeCommand:"git branch foo; git clone"}},{type:"ModalAlert",options:{markdowns:["接下来的关卡会相当的困难，所以在本关会让你做许多事情，先来热热身。","","克隆一个远程仓库（用 `git clone`），再在刚创建的远程仓库中模拟一些修改，然后在你自己的本地分支上做一些提交，再拉取远程仓库的变更。这看起来像是包含了好几节的课程。"]}}]},de_DE:{childViews:[{type:"ModalAlert",options:{markdowns:["## Zusammenarbeit simulieren","","Hier ist das Problem -- für einige der folgenden Level müssen wir lernen, wie man Änderungen vom entfernten Server holt.","",'Das heißt wir müssen im Grunde "so tun" also ob der Server von einem Kollegen / Freund / Mitarbeiter aktualisiert worden wäre, manchmal ein bestimmter Branch oder eine bestimmte Anzahl von Commits.',"","Um das zu tun führen wir den passend benannten Befehl `git fakeTeamwork` ein! Er ist ziemlich selbsterklärend, schauen wir uns ihn an ..."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Das normale Verhalten von `fakeTeamwork` ist es, einen Commit auf den entfernten `master` zu machen."],afterMarkdowns:["Da haben wir's -- der Server ist mit einem neuen Commit aktualisiert worden und wir haben ihn noch nicht lokal, weil wir nicht `git fetch` oder `git pull` ausgeführt haben."],command:"git fakeTeamwork",beforeCommand:"git clone"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Du kannst auch angeben wieviele Commits oder auf welchem Branch sie gemacht werden sollen, indem du das an den Befehl anhängst."],afterMarkdowns:["Mit einem Befehlt haben wir simuliert, dass ein Kollege drei Commits auf den  Branch `foo` gepackt hat."],command:"git fakeTeamwork foo 3",beforeCommand:"git branch foo; git clone"}},{type:"ModalAlert",options:{markdowns:["Die kommenden Level werden recht anspruchsvoll, daher verlangen wir auch in diesem Level schon etwas mehr.","","Leg los und erstelle ein Remote (mit `git clone`), simuliere ein paar Änderungen auf dem Server, committe lokal und dann zieh dir die Änderungen vom Server. Das ist wie mehrere Level in einem!"]}}]},ru_RU:{childViews:[{type:"ModalAlert",options:{markdowns:["## Симуляция совместной работы","","В данном уроке мы находимся в немного затруднительном положении - для выполнения ряда упражнений нам нужно обучить вас скачивать наработки и изменения, которые были сделаны в удалённом репозитории.","",'Это означает, что нам следует "сделать вид", как будто мы знаем о том, что наш удалённый репозиторий, с которым мы работаем, был изменён одним из ваших коллег / друзей / единомышленников. Это может быть какая-то ветка, либо же какой-то конкретный коммит.',"","Для того, чтобы добиться своих целей, нам предоставляется команда со звучным именем `git fakeTeamwork`! Имя команды однозначно даёт понять, что она выполняет. Давайте ознакомимся с демо..."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:['Поведение команды `fakeTeamwork` по умолчанию заключается в том, чтобы просто "инициировать" коммит на master-е'],afterMarkdowns:["Ну вот - удалённый репозиторий был изменён при помощи добавления нового коммита, и мы ещё не скачали этот коммит, потому что не запустили команду `git fetch`."],command:"git fakeTeamwork",beforeCommand:"git clone"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["В данной команде вам доступна возможность указать ветку и количество добавляемых коммитов"],afterMarkdowns:["С помощью одной лишь команды мы симулируем добавление трёх коммитов в ветку `foo` на удалённом репозитории"],command:"git fakeTeamwork foo 3",beforeCommand:"git branch foo; git clone"}},{type:"ModalAlert",options:{markdowns:["Последующие уровни будут довольно сложными, поэтому в этом упражнении от вас больше ничего не требуется.","",'Вперёд! Склонируйте удалённый репозиторий (с помощью `git clone`), симулируйте любые изменения на этом удалённом репозитории, сделайте какие-нибудь свои коммиты и затем скачайте "чужие" изменения. Это выглядит как несколько уроков в одном!']}}]},ja:{childViews:[{type:"ModalAlert",options:{markdowns:["## 連携のシミュレーション","","ここでは少し奇怪なものを取り扱います -- これは次回以降の幾つかのレッスンのためのもので、リモートセクションで変更点の反映方法を教えるのに必要なものです。","","つまり、私たちには時にはリモートの特定のブランチや特定の数のコミットを、同僚/友人/共同開発者の一人が更新した「ふりをする」ことが必要だというわけです。","","これを行うために、私たちは適切に選んだ名前のコマンド`git fakeTeamwork`を導入しました！とても明白でしょう？では、デモを見てみましょう。","","*注：もちろん、本当のgit上にこのようなコマンドは存在しません！変更は、「実在する」同僚や友人が行ってくれるでしょうから！ここではレッスンのために「擬似的に」導入しているにすぎません！*"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["`fakeTeamwork`のデフォルトの動作は、単にmasterの上にコミットを乗っけるだけです"],afterMarkdowns:["ではいってみましょう -- リモートには新しいコミットが更新され、それはまだ私たちの手元にはダウンロードされていません。なぜなら、`git fetch`を走らせていませんからね。"],command:"git fakeTeamwork",beforeCommand:"git clone"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["さらに特定の数のコミット、または追加するブランチをコマンドで指定することもできます。"],afterMarkdowns:["一つのコマンドで、チームメイトが3個のコミットをリモートの`foo`ブランチにプッシュするという動作を再現することができました。"],command:"git fakeTeamwork foo 3",beforeCommand:"git branch foo; git clone"}},{type:"ModalAlert",options:{markdowns:["今後のレベルはどんどん難しくなっていくでしょうから、このレベルでも私たちはあなたに少々多くのことを求めます。","","先に行くには、リモートを作り（`git clone`で）、リモートに幾つかの変更を再現して、自身のリポジトリにコミットし、変更を取り込む必要があります。これは、このリモートのセクションでやった幾つかのレッスンの内容と似ていますね！"]}}]},uk:{childViews:[{type:"ModalAlert",options:{markdowns:["## Симулюємо співпрацю","","Зараз ми знаходимося в незручному становищі -- в деяких із наступних уроків нам потрібно буде пояснити як витягнути зміни з віддаленого репозиторію, що були туди додані іншим учасником.","",'Це означає, що нам треба "вдавати", що віддалений репозиторій був модифікований твоїм колегою / друзями / небайдужими, іноді на специфічній гілці чи коміті.',"","Щоб зробити це, ми додали влучно названу команду `git fakeTeamwork` (симуляціяКолективноїРоботи)! Насправді, з симуляцією колективної роботи стикався мабуть кожен, хто працював в колективі, тож перейдімо до прикладів..."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["За замовчуванням `fakeTeamwork` просто додасть коміт в гілку `master`"],afterMarkdowns:["Є -- до віддаленого репозиторію додався ще один коміт, проте ми ще його не звантажили, оскільки ще не виконали `git fetch`."],command:"git fakeTeamwork",beforeCommand:"git clone"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Ти також можеш вказати кількість комітів чи гілку, в яку потрібно додати коміти."],afterMarkdowns:["Виконавши одну команду ми симулювали колегу, що запушив три коміти в гілку `foo` на віддаленому репозиторії."],command:"git fakeTeamwork foo 3",beforeCommand:"git branch foo; git clone"}},{type:"ModalAlert",options:{markdowns:["Наступні рівні будуть доволі складними, тому, щоб підготуватись, на цьому рівні теж доведеться не солодко.","","Створи віддалений репозиторій (за допомогою `git clone`), зроби кілька фіктивних змін, зроби кілька комітів локально, й підвантаж віддалені зміни. Це як кілька уроків в одному!"]}}]},ko:{childViews:[{type:"ModalAlert",options:{markdowns:["## 협동 가장하기","","조금 곤란한일이 생겨버렸습니다 -- 앞으로 배울 레슨들에서 원격 저장소에서 일어난 변경들을 어떻게 로컬로 가져올것인지에 대해 배워 볼것입입니다.","",'그런데 여기서 우리는 불가피하게 그 _변경_들을 만들어야 되는데, 원격 저장소가 동료 / 친구 / 협력자등에 의해 특정 브랜치나 여러개의 커밋이 갱신되는 경우를 표현할 필요가 있습니다. 즉 우리는 팀워크를 "가장"할 필요가 있는것 입니다.',"","이런 문제를 해결하기 위해서 `git fakeTeamwork` 명령을 만들었습니다! 이름이 참 적절하죠? 예시를 통해 확인해봅시다..."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["`fakeTeamwork`의 기본 행동은 원격 master에 간단히 하나의 커밋을 하는것 입니다."],afterMarkdowns:["자 됬습니다 -- 원격 저장소에 새로운 커밋이 갱신되었습니다. 아직 `git fetch`를 하지 않았기 때문에 로컬로 내려받아지지는 않았습니다."],command:"git fakeTeamwork",beforeCommand:"git clone"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["명령어에 추가할 커밋의 갯수나 어떤 브랜치에 추가할지 지정하는것도 가능합니다. 다음과 같이 명령어 뒤에 추가하면 됩니다."],afterMarkdowns:["하나의 명령어로 팀원이 원격저장소의 `foo` 브랜치에 세개의 커밋을 push한것처럼 가장했습니다."],command:"git fakeTeamwork foo 3",beforeCommand:"git branch foo; git clone"}},{type:"ModalAlert",options:{markdowns:["뒤의 레벨들이 조금 어렵기 때문에, 이번 레벨에서 여러분에게 조금 많은것을 요구하려고 합니다.","","원격 저장소를 하나 만들고(`git clone`), 원격 저장소에 몇가지 가짜 변경을 만들고 로컬에서 커밋하고 원격의 변경들을 가져오세요. Goal과 같은 결과가 나오면 됩니다. 몇개의 레슨이 하나에 있다고 보면 되겠네요! 도전해봅시다."]}}]},vi:{childViews:[{type:"ModalAlert",options:{markdowns:["## Mô phỏng hợp tác","","Bây giờ khó đây -- để chuẩn bị cho những bài học tới, chúng tôi cần chỉ bạn cách kéo về những cập nhật có trên kho chứa từ xa.","",'Có nghĩa là ta cần "giả vờ" kho chứa từ xa được cập nhật bởi đồng nghiệp / bạn / cộng tác viên của bạn, có khi là một nhánh xác định hoặc là một số commit.',"","Để làm điều này, chúng tôi sẽ giới thiệu cho bạn một lệnh tự tạo `git fakeTeamwork`! Cái tên nói lên tất cả, cùng xem thử bản giới thiệu..."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Hành xử mặc định của `fakeTeamwork` đơn giản là tạo ra một commit ở trên nhánh master từ xa"],afterMarkdowns:["Đó -- kho chứa từ xa đã được cập nhật thêm một commit, và ta chưa tải commit đó xuống vì ta chưa hề chạy lệnh `git fetch`."],command:"git fakeTeamwork",beforeCommand:"git clone"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Bạn cũng có thể chỉ định số lượng commit bằng cách thêm con số đằng sau câu lệnh"],afterMarkdowns:["Chỉ với một câu lệnh ta có thể giả lập tạo ra 3 commit trên nhánh `foo` từ xa của ta"],command:"git fakeTeamwork foo 3",beforeCommand:"git branch foo; git clone"}},{type:"ModalAlert",options:{markdowns:["Các cấp độ tới sẽ khá là khó, nên ở cấp độ này chúng tôi sẽ yêu cầu bạn thêm một chút.","","Sao chép một kho chứa từ xa (sử dụng `git clone`), sau đó mô phỏng một số thay đổi trong kho chứa từ xa mà bạn vừa tạo, sau đó thực hiện một số commit trên nhánh cục bộ của riêng bạn, sau đó kéo các thay đổi từ kho chứa từ xa. Nhiều bài học trong một bài."]}}]}}}},{}],133:[function(e,t,o){o.level={goalTreeString:'{"branches":{"master":{"target":"C2","id":"master"},"bugFix":{"target":"C3","id":"bugFix"},"o/master":{"target":"C5","id":"o/master"},"o/bugFix":{"target":"C7","id":"o/bugFix"}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"},"C2":{"parents":["C1"],"id":"C2"},"C3":{"parents":["C1"],"id":"C3"},"C4":{"parents":["C2"],"id":"C4"},"C6":{"parents":["C3"],"id":"C6"},"C5":{"parents":["C4"],"id":"C5"},"C7":{"parents":["C6"],"id":"C7"}},"HEAD":{"target":"bugFix","id":"HEAD"},"originTree":{"branches":{"master":{"target":"C5","id":"master"},"bugFix":{"target":"C7","id":"bugFix"}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"},"C2":{"parents":["C1"],"id":"C2"},"C3":{"parents":["C1"],"id":"C3"},"C4":{"parents":["C2"],"id":"C4"},"C5":{"parents":["C4"],"id":"C5"},"C6":{"parents":["C3"],"id":"C6"},"C7":{"parents":["C6"],"id":"C7"}},"HEAD":{"target":"bugFix","id":"HEAD"}}}',solutionCommand:"git fetch",startTree:'{"branches":{"master":{"target":"C2","id":"master"},"bugFix":{"target":"C3","id":"bugFix"},"o/master":{"target":"C2","id":"o/master"},"o/bugFix":{"target":"C3","id":"o/bugFix"}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"},"C2":{"parents":["C1"],"id":"C2"},"C3":{"parents":["C1"],"id":"C3"}},"HEAD":{"target":"bugFix","id":"HEAD"},"originTree":{"branches":{"master":{"target":"C5","id":"master"},"bugFix":{"target":"C7","id":"bugFix"}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"},"C2":{"parents":["C1"],"id":"C2"},"C3":{"parents":["C1"],"id":"C3"},"C4":{"parents":["C2"],"id":"C4"},"C5":{"parents":["C4"],"id":"C5"},"C6":{"parents":["C3"],"id":"C6"},"C7":{"parents":["C6"],"id":"C7"}},"HEAD":{"target":"bugFix","id":"HEAD"}}}',name:{en_US:"Git Fetchin'",fr_FR:"Git fetch",de_DE:"Git Fetch",ja:"Git Fetch",es_AR:"git fetch",es_ES:"git fetch",pt_BR:"Git Fetch",gl:"Git Fetch",zh_CN:"Git Fetch",zh_TW:"git fetch",ru_RU:"Git fetch",uk:"Git fetch",ko:"Git Fetch",vi:"Git Fetch"},hint:{en_US:"just run git fetch!",fr_FR:"Exécuter juste git fetch",de_DE:"Einfach git fetch ausführen!",ja:"単にgit fetchを実行！",es_AR:"Simplemente ¡hacé git fetch!",es_ES:"Simplemente ¡escribe git fetch!",pt_BR:"Simplesmente chame git fetch!",gl:"¡Sinxelamente fai git fetch!",zh_CN:"只需要运行 git fetch 命令!",zh_TW:"只要下 git fetch 指令",ru_RU:"Просто выполните git fetch!",uk:"Просто виконай git fetch!",ko:"그냥 git fetch를 하세요!",vi:"Gõ git fetch là được!"},startDialog:{en_US:{childViews:[{type:"ModalAlert",options:{markdowns:["## Git Fetch","","Working with git remotes really just boils down to transferring data _to_ and _from_ other repositories. As long as we can send commits back and forth, we can share any type of update that is tracked by git (and thus share work, new files, new ideas, love letters, etc.).","","In this lesson we will learn how to fetch data _from_ a remote repository -- the command for this is conveniently named `git fetch`.","","You'll notice that as we update our representation of the remote repository, our _remote_ branches will update to reflect that new representation. This ties into the previous lesson on remote branches"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Before getting into the details of `git fetch`, let's see it in action! Here we have a remote repository that contains two commits that our local repository does not have."],afterMarkdowns:["There we go! Commits `C2` and `C3` were downloaded to our local repository, and our remote branch `o/master` was updated to reflect this."],command:"git fetch",beforeCommand:"git clone; git fakeTeamwork 2"}},{type:"ModalAlert",options:{markdowns:["### What fetch does","","`git fetch` performs two main steps, and two main steps only. It:","","* downloads the commits that the remote has but are missing from our local repository, and...","* updates where our remote branches point (for instance, `o/master`)","","`git fetch` essentially brings our _local_ representation of the remote repository into synchronization with what the _actual_ remote repository looks like (right now).","","If you remember from the previous lesson, we said that remote branches reflect the state of the remote repositories _since_ you last talked to those remotes. `git fetch` is the way you talk to these remotes! Hopefully the connection between remote branches and `git fetch` is apparent now.","","`git fetch` usually talks to the remote repository through the Internet (via a protocol like `http://` or `git://`).",""]}},{type:"ModalAlert",options:{markdowns:["### What fetch doesn't do","","`git fetch`, however, does not change anything about _your_ local state. It will not update your `master` branch or change anything about how your file system looks right now.","","This is important to understand because a lot of developers think that running `git fetch` will make their local work reflect the state of the remote. It may download all the necessary data to do that, but it does _not_ actually change any of your local files. We will learn commands in later lessons to do just that :D","","So at the end of the day, you can think of running `git fetch` as a download step."]}},{type:"ModalAlert",options:{markdowns:["To finish the level, simply `git fetch` and download all the commits!"]}}]},fr_FR:{childViews:[{type:"ModalAlert",options:{markdowns:["## Git Fetch","","Travailler avec les dépôts gits distants se résume en pratique à transférer nos données _depuis_ et _vers_ ces autres dépôts. Du moment que nous pouvons envoyer des commits en avance et en retard, nous pouvons partager tous les types de mises à jour qui sont gérées par git (et donc partager notre travail, de nouveaux fichiers, de nouvelles idées, des lettres d'amour, etc.).","","Dans cette leçon nous allons apprendre comment rapporter (fetch) des données _depuis_ un dépôt distant vers le nôtre : la commande pour cela est astucieusement dénommée `git fetch`.","","Vous allez remarquer qu'au moment où nous mettons à jour notre version du dépôt distant, nos branches _distantes_ vont se mettre à jour pour refléter cette nouvelle représentation. Cela est lié à la leçon précédente sur les branches distantes."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Avant d'aller dans les détails de `git fetch`, voyons-le en action ! Ici nous avons un dépôt distant qui contient deux commits que notre dépôt local n'a pas."],afterMarkdowns:["Voilà ! Les commits `C2` et `C3` ont été téléchargés dans notre dépôt local, et notre branche distante `o/master` a été mise à jour pour refléter cela."],command:"git fetch",beforeCommand:"git clone; git fakeTeamwork 2"}},{type:"ModalAlert",options:{markdowns:["### Ce que fetch fait","","`git fetch` procède en deux étapes principales, ni plus ni moins. Cela :","","* télécharge les commits que le dépôt distant possède mais qui ne sont pas dans le nôtre, puis...","* met à jour nos branches distantes (par exemple, `o/master`).","","`git fetch` prend en fait notre représentation _locale_ du dépôt distant pour la synchroniser avec ce à quoi le dépôt distant ressemble _réellement_ (à ce moment-là).","","Si vous vous rappelez de la précédente leçon, nous avons dit que les branches distantes reflètent l'état du dépôt distant _depuis_ la dernière fois où vous avez parlé à ces branches distantes. `git fetch` est le moyen de parler à ces branches distantes ! La relation entre `git fetch` et les branches distantes devrait vous apparaître clairement maintenant.","","`git fetch` contacte le dépôt distant par Internet (via un protocole comme `http://` ou `git://`).",""]}},{type:"ModalAlert",options:{markdowns:["### Ce que fetch ne fait pas","","`git fetch`, cependant, ne change rien à _votre_ état local. Il ne met pas à jour votre branche `master` et ne va pas changer quelque chose aux fichiers qui se trouvent actuellement dans votre répertoire de travail.","","C'est important à comprendre car un nombre important de développeurs pensent qu'exécuter `git fetch` va mettre leur dépôt local dans le même état que le distant. Cela peut télécharger toutes les données nécessaires pour faire cela, mais cela ne change en réalité _rien_ sur vos fichiers locaux. Les prochains niveaux seront justement dédiés aux commandes qui permettent de faire cela :D","","Au bout du compte, vous pouvez vous représenter `git fetch` comme une étape de téléchargement."]}},{type:"ModalAlert",options:{markdowns:["Pour finir ce niveau, exécuter simplement `git fetch` et téléchargez tous les commits !"]}}]},es_AR:{childViews:[{type:"ModalAlert",options:{markdowns:["## Git Fetch","","Trabajar con remotos en git en realidad se reduce a transferir datos _de_ y _hacia_ otros repositorios. Mientras podamos mandar commits de un lado al otro, podemos compartir cualquier tipo de actualización registrada por git (y, por ende, compartir trabajo, archivos nuevos, ideas nuevas, cartas de amor, etc).","","En esta lección aprenderemos cómo traer (hacer `fetch`) datos _desde_ un repositorio remoto - el comando para esto se llama, convenientemente, `git fetch`).","","Vas a notar que a medida que actualicemos nuestra representación de nuestro repositorio remoto, nuestras ramas _remotas_ van a actualizarse para reflejar esa nueva representación. Esto está ligado a la lección anterior sobre ramas remotas"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Antes de entrar en los detalles de `git fetch`, veámoslo en acción. Acá tenemos un repositorio remoto que contiene dos commits que nuestro repositorio local no tiene."],afterMarkdowns:["¡Ahí vamos! Bajamos los commits `C2` y `C3` a nuestro repositorio local, y nuestra rama remota `o/master` fue actualizada para reflejar este cambio."],command:"git fetch",beforeCommand:"git clone; git fakeTeamwork 2"}},{type:"ModalAlert",options:{markdowns:["### ¿Qué hace fetch?","","`git fetch` hace dos simples pasos, y sólo dos simples pasos:","","* baja los commits que el remoto tiene pero no están en nuestro repositorio local, y...","* actualiza a dónde apuntan nuestras ramas remotas (por ejemplo, `o/master`)","","`git fetch` esencialmente sincroniza nuestra representación _local_ del repositorio remoto con el _verdadero_ estado del repositorio remoto (en este momento).","","Si recordás la lección anterior, dijimos que las ramas remotas reflejan el estado de los repositorios remotos _desde_ la última vez que hablaste con ellos. ¡`git fetch` es la manera en que hablás con esos remotos! Espero que ahora esté clara la conexión entre las ramas remotas y `git fetch`.","","Usualmente, `git fetch` habla con el repositorio a través de internet (usando un protocolo como `http://` o `git://`).",""]}},{type:"ModalAlert",options:{markdowns:["### ¿Qué *no* hace fetch?","","Sin embargo, `git fetch` no modifica en absoluto _tu_ estado local. No va a actualizar tu rama `master` ni va a cambiar nada sobre cómo se ve tu sistema de archivos en este momento.","","Es importante entender esto, porque un montón de desarrolladores piensan que correr `git fetch` hará que su estado local refleje el estado del remoto. `git fetch` puede descargar los datos necesarios para hacerlo, pero *no* cambia ninguno de tus archivos locales. Vamos a aprender otros comandos para hacer eso más adelante :D","","Entonces, después de todo, podés pensar a `git fetch` como un paso de descarga."]}},{type:"ModalAlert",options:{markdowns:["Para completar este nivel, simplemente corré `git fetch` y bajate todos los commits"]}}]},es_ES:{childViews:[{type:"ModalAlert",options:{markdowns:["## Git Fetch","","Trabajar con remotos en git en realidad se reduce a transferir datos _de_ y _hacia_ otros repositorios. Mientras podamos mandar commits de un lado al otro, podemos compartir cualquier tipo de actualización registrada por git (y, por ende, compartir trabajo, archivos nuevos, ideas nuevas, cartas de amor, etc).","","En esta lección aprenderemos cómo traer (hacer `fetch`) datos _desde_ un repositorio remoto - el comando para esto se llama, convenientemente, `git fetch`).","","Vas a notar que a medida que actualicemos nuestra representación de nuestro repositorio remoto, nuestras ramas _remotas_ van a actualizarse para reflejar esa nueva representación. Esto está ligado a la lección anterior sobre ramas remotas"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Antes de entrar en los detalles de `git fetch`, veámoslo en acción. Aquí tenemos un repositorio remoto que contiene dos commits que nuestro repositorio local no tiene."],afterMarkdowns:["¡Allá vamos! Bajamos los commits `C2` y `C3` a nuestro repositorio local, y nuestra rama remota `o/master` fue actualizada para reflejar este cambio."],command:"git fetch",beforeCommand:"git clone; git fakeTeamwork 2"}},{type:"ModalAlert",options:{markdowns:["### ¿Qué hace fetch?","","`git fetch` hace dos simples pasos, y sólo dos simples pasos:","","* baja los commits que el remoto tiene pero no están en nuestro repositorio local, y...","* actualiza a dónde apuntan nuestras ramas remotas (por ejemplo, `o/master`)","","`git fetch` escencialmente sincroniza nuestra representación _local_ del repositorio remoto con el _verdadero_ estado del repositorio remoto (en este momento).","","Si recuerdas la lección anterior, dijimos que las ramas remotas reflejan el estado de los repositorios remotos _desde_ la última vez que hablaste con ellos. ¡`git fetch` es la manera en la que hablas con esos remotos! Espero que ahora esté clara la conexión entre las ramas remotas y `git fetch`.","","Usualmente, `git fetch` habla con el repositorio a través de internet (usando un protocolo como `http://` o `git://`).",""]}},{type:"ModalAlert",options:{markdowns:["### ¿Qué *no* hace fetch?","","Sin embargo, `git fetch` no modifica en absoluto _tu_ estado local. No va a actualizar tu rama `master` ni va a cambiar nada sobre cómo se ve tu sistema de archivos en este momento.","","Es importante entender esto, porque un montón de desarrolladores piensan que correr `git fetch` hará que su estado local refleje el estado del remoto. `git fetch` puede descargar los datos necesarios para hacerlo, pero *no* cambia ninguno de tus archivos locales. Vamos a aprender otros comandos para hacer eso más adelante :D","","Entonces, después de todo, puedes pensar sobre `git fetch` como un proceso de descarga."]}},{type:"ModalAlert",options:{markdowns:["Para completar este nivel, simplemente ejecuta `git fetch` y bájate todos los commits"]}}]},pt_BR:{childViews:[{type:"ModalAlert",options:{markdowns:["## Git Fetch","","Trabalhar com remotos no Git, no final das contas, se resume a transferir dados _de_ e _para_ outros repositórios. Desde que possamos enviar commits para um lado e para o outro, poderemos compartilhar qualquer tipo de atualização que seja gerenciada pelo Git (e portanto compartilhar trabalho, novos arquivos, novas ideias, cartas de amor, etc).","","Nesta lição vamos aprender como baixar dados _de_ um repositório remoto -- o comando para isso é convenientemente chamado de `git fetch`.","","Você perceberá que conforme atualizarmos a representação do repositório remoto, nossos ramos _remotos_ atualizar-se-ão para refletir essa nova representação. Isso tem a ver com o que vimos na lição anterior sobre ramos remotos"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Antes de entrar nos detalhes do `git fetch`, vejamo-no em ação! Aqui temos um repositório remoto que contém dois commits que nosso repositório local não possui."],afterMarkdowns:["Lá vamos nós! Os commits `C2` e `C3` foram baixados para o nosso repositório local, e nosso ramo remoto `o/master` foi atualizado para refletir esse fato."],command:"git fetch",beforeCommand:"git clone; git fakeTeamwork 2"}},{type:"ModalAlert",options:{markdowns:["### O que o fetch faz","","O `git fetch` realiza dois passos principais, e somente estes dois passos principais. Ele:","","* Baixa os commits que o repositório remoto possui mas que estão faltando no repositório local, e...","* Atualiza a referência para a qual os ramos remotos (por exemplo, `o/master`) estão apontando","","O `git fetch` essencialmente faz com que nossa representação _local_ do repositório remoto fique sincronizada com a forma com que o repositório remoto _de fato_ se parece (naquele momento).","","Se você lembrar da lição anterior, nós dissemos que os ramos remotos refletem o estado dos repositórios remotos _desde a última vez_ na qual você falou com esses repositórios. O `git fetch` é a única forma de falar com esses repositórios remotos! Espero que a conexão entre os ramos remotos e o `git fetch` esteja clara agora.","","O `git fetch` geralmente conversa com o repositório remoto por meio da Internet (usando um protocolo como `http://` ou `git://`).",""]}},{type:"ModalAlert",options:{markdowns:["### O que o fetch NÃO faz","","O `git fetch`, no entanto, não muda nada do estado _local_ do repositório. Ele não atualiza o seu ramo `master` nem muda nada na forma como o seu sistema de arquivos está no momento.","","É importante entender isso, pois muitos desenvolvedores pensam que executar `git fetch` fará com que o trabalho local reflita o estado do repositório remoto. Ele pode até baixar todos os dados necessários para fazê-lo, mas ele _não_ muda de fato nenhum dos arquivos locais. Vamos aprender comandos para fazê-lo nas lições a seguir :D","","No final das contas, você pode pensar no `git fetch` como um passo de download."]}},{type:"ModalAlert",options:{markdowns:["Para terminar este nível, simplesmente execute `git fetch` e baixe todos os commits!"]}}]},gl:{childViews:[{type:"ModalAlert",options:{markdowns:["## Git Fetch","","Traballar con respositorios remotos en Git, a fin de contas, resúmese en transferir datos _dun_ repositorio _cara_ outros repositorios. Dende que podemos enviar commits dun lado cara o outro, poderemos compartir calquera tipo de actualización que sexa xerada por git (e polo tanto compartir o traballo, novos arquivos, novas ideas, cartas de amor, etc).","","Nesta lección imos aprender como baixar os cambios _dun_ repositorio remoto -- o comando para iso é `git fetch`.","","Percibirás que conforme atualizamos a representación do repositorio remoto, as nosas ramas _remotas_ actualizaranse para reflexar a nova representación. Iso ten que ver co que vimos na lección anterior sobre as ramas remotas"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Ántes de entrar nos detalles de `git fetch`, vexámolo en acción! Aquí temos un repositorio remoto que contén dous commits que o noso repositorio local non ten."],afterMarkdowns:["Alá imos! Os commits `C2` e `C3` baixáronse ó noso repositorio local, e a nosa rama `o/master` actualizouse para reflexar ese cambio."],command:"git fetch",beforeCommand:"git clone; git fakeTeamwork 2"}},{type:"ModalAlert",options:{markdowns:["### O que fai o fetch","","`git fetch` fai dous pasos pasos principais, e soamente estes dous pasos princpipais. Son:","","* Baixa os commits que o repositório remoto contén pero non temos nos no noso repositoiro local, e...","* Actualiza a referencia nas ramas remotas (por exemplo, `o/master`) nas que se está apuntando","","`git fetch` esencialmente fai que a nosa representación _local_ do repositorio remoto se sincronice ca forma que posúe o repositorio remoto, _de feito_ parecese (nese momento).","","Se ti lembras a lección anterior, nos dixemos que as ramas remotas reflexan o estado dos repositorios remotos _dende a última vez_ na que ti fixeches un commit dese repositorio. O `git fetch` é a única forma de falar con eses repositorios remotos! Agardo que a conexión entre as ramas remotas e o `git fetch` esté clara dabondo agora.","","`git fetch` xeralmente fala co repositorio remoto por medio da rede (usando un protocolo como `http://`, `git://` ou `ssh`).",""]}},{type:"ModalAlert",options:{markdowns:["### O que fetch NON fai","","`git fetch`, por agora, non cambia nada no estado _local_ do repositorio. El solo actualiza a rama `master` sen facer cambios na forma de cómo está o teu sistema de arquivos nese momento.","","É importante entender iso, xa que moitos desenvolvedores pensan que executar `git fetch` fará que o traballo local se vexa modificado polo repositorio remoto. El pode que baixara todos os cambios necesarios para facelo, pero, o comando _non_ cambia cómo están os teus arquivos locais. Imos aprender comandos para facer esas conexións :D","","A fin de contas, ti podes pensar en `git fetch` como unha descarga."]}},{type:"ModalAlert",options:{markdowns:["Para rematar este nivel, so executa `git fetch` e baixa todos os commits!"]}}]},zh_TW:{childViews:[{type:"ModalAlert",options:{markdowns:["## git fetch","","透過 git remote 其實就是把資料接收或傳送到其它的 repository，只要我們可以將資料傳進及傳出，我們就可以分享任何被 git 所追蹤的 repository 的更新（例如分享工作進度，新的檔案，新的想法，以及情書等等...）。","","在這個教學中，我們會學習到如何從 remote repository 來 fetch （抓取）資料，這個指令叫作 `git fetch`。","","你將會注意到當我們的 remote repository 更新的時候，相對應的 _remote_ branch 也會反應該更新，這個跟我們之前所提到的 remote branch 的特性是吻合的。"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["在講到 `git fetch` 的細節之前，我們要先來看一下例子！在這裡我們有一個新增了兩個 commit 的 remote repository，而且我們的 local repository 並沒有包含這兩個 commit。"],afterMarkdowns:["看吧！commit `C2` 以及 `C3` 已經被下載到我們的 local repository，而且我們的 remote branch `o/master` 也更新了。"],command:"git fetch",beforeCommand:"git clone; git fakeTeamwork 2"}},{type:"ModalAlert",options:{markdowns:["### fetch 做了什麼","","`git fetch` 只有執行了兩個主要步驟，包含：","","* 下載 remote 有的 commit，但是在我們的 local repository 是沒有該 commit。還有...","* 更新我們 remote branch 所指向的地方（例如， `o/master`）","","基本上，`git fetch` 同步了我們的 local repository 以及 remote repository 的最新狀態。","","假如你還記得之前的教學的話，我們說過 remote branch 反應了 remote repository 的狀態，原因在於說你最後接觸的是這些 remote repository，而你就是利用 `git fetch` 來接觸這些 remote repository！現在 remote branch 跟 `git fetch` 的關係已經很明顯了。","","`git fetch` 通常是透過網路來跟 remote 溝通（透過一個 protocol （協定），例如 `http://` 或者是 `git://`）。",""]}},{type:"ModalAlert",options:{markdowns:["### fetch 沒有做的事情","","然而，`git fetch` 並不會影響到在你的 local repository 中的 `master` branch，他並不會將你的 `master` branch 更新到最新的狀態。","","這個觀念很重要，因為很多程式設計師以為 `git fetch` 可以讓他們在 local repository 上面的工作跟 remote repository 的工作可以同步。它是會下載同步所需的資料，但是不會更新任何的檔案，我們會在後面的教學中提到如何做到這件事情。:D","","因此，你可以把 `git fetch` 想成是在下載資料。"]}},{type:"ModalAlert",options:{markdowns:["要完成這一關，只要透過 `git fetch` 並且下載全部的 commit 即可！"]}}]},zh_CN:{childViews:[{type:"ModalAlert",options:{markdowns:["## Git Fetch","","Git 远程仓库相当的操作实际可以归纳为两点：向远程仓库传输数据以及从远程仓库获取数据。既然我们能与远程仓库同步，那么就可以分享任何能被 Git 管理的更新（因此可以分享代码、文件、想法、情书等等）。","","本节课我们将学习如何从远程仓库获取数据 —— 命令如其名，它就是 `git fetch`。","","你会看到当我们从远程仓库获取数据时, 远程分支也会更新以反映最新的远程仓库。在上一了我们已经提及过这一点了。"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["在解释 `git fetch` 前，我们先看看实例。这里我们有一个远程仓库, 它有两个我们本地仓库中没有的提交。"],afterMarkdowns:["就是这样了! `C2`,`C3` 被下载到了本地仓库，同时远程分支 `o/master` 也被更新，反映到了这一变化"],command:"git fetch",beforeCommand:"git clone; git fakeTeamwork 2"}},{type:"ModalAlert",options:{markdowns:["### git fetch 做了些什么","","`git fetch` 完成了仅有的但是很重要的两步:","","* 从远程仓库下载本地仓库中缺失的提交记录","* 更新远程分支指针(如 `o/master`)","","`git fetch` 实际上将本地仓库中的远程分支更新成了远程仓库相应分支最新的状态。","","如果你还记得上一节课程中我们说过的，远程分支反映了远程仓库在你**最后一次与它通信时**的状态，`git fetch` 就是你与远程仓库通信的方式了！希望我说的够明白了，你已经了解 `git fetch` 与远程分支之间的关系了吧。","","`git fetch` 通常通过互联网（使用 `http://` 或 `git://` 协议) 与远程仓库通信。",""]}},{type:"ModalAlert",options:{markdowns:["### git fetch 不会做的事","","`git fetch` 并不会改变你本地仓库的状态。它不会更新你的 `master` 分支，也不会修改你磁盘上的文件。","","理解这一点很重要，因为许多开发人员误以为执行了 `git fetch` 以后，他们本地仓库就与远程仓库同步了。它可能已经将进行这一操作所需的所有数据都下载了下来，但是**并没有**修改你本地的文件。我们在后面的课程中将会讲解能完成该操作的命令 :D","","所以, 你可以将 `git fetch` 的理解为单纯的下载操作。"]}},{type:"ModalAlert",options:{markdowns:["要完成本关，只需用 `git fetch` 下载所有的提交！"]}}]},de_DE:{childViews:[{type:"ModalAlert",options:{markdowns:["## Git Fetch","","In Git mit entfernten Repositorys zu arbeiten lässt sich wirklich auf das Hin- und Zurückübertragen von Daten reduzieren. Solange wir Commits hin und her schicken können, können wir jede Art Update teilen, das von Git getrackt wird (und somit Arbeit, neue Dateien, neue Ideen, Liebesbriefe etc. teilen).","","In diesem Level werden wir lernen, wie man Daten _von_ einem entfernten Repository holt -- der entsprechende Befehl heißt praktischerweise `git fetch`.","","Dir wird auffallen, dass mit der Aktualisierung unserer Darstellung des entfernten Repositorys die _Remote_ Branches auf den neuesten Stand gebracht werden. Das passt zum vorherigen Level über Remote Branches."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Bevor wir uns die Einzelheiten von `git fetch` ansehen wollen wir es mal in Aktion sehen. Wir haben hier ein entferntes Repository, das zwei Commits hat die in unserem lokalen Repository fehlen."],afterMarkdowns:["Das war's! Die Commits `C2` und `C3` wurden zu unserem Repository heruntergeladen und unser Remote Branch `o/master` wurde aktualisiert."],command:"git fetch",beforeCommand:"git clone; git fakeTeamwork 2"}},{type:"ModalAlert",options:{markdowns:["### Was Fetch tut","","`git fetch` führt genau zwei Schritte aus:","","* Es lädt die Commits herunter, die im lokalen Repository fehlen, und ...","* aktualisiert die Remote Branches wo nötig (zum Beispiel, `o/master`).","","`git fetch` synchronisiert im Prinzip unsere _lokale_ Abbildung des entfernten Repositorys mit dem wie das entfernte Repository _tatsächlich_ aussieht (in diesem Moment).","","Wie du dich vielleicht erinnerst, haben wir im letzten Level gesagt, dass die Remote Branches den Zustand der Branches auf dem entfernten Repository darstellen _seit_ du das letzte Mal dieses Repository angesprochen hast. `git fetch` ist die Methode mit der du das Repository ansprichst! Der Zusammenhang zwischen Remote Branches und `git fetch` ist damit hoffentlich klar.","","`git fetch` kommuniziert mit dem entfernten Repository in der Regel über das Internet (über ein Protokoll wie `http://` oder `git://`).",""]}},{type:"ModalAlert",options:{markdowns:["### Was Fetch nicht tut","","`git fetch` ändert allerdings überhaupt nichts an _deinen_ lokalen Branches. Es aktualisiert nicht deinen `master` oder ändert irgendetwas an deinem Checkout.","","Das ist wichtig zu wissen, denn eine Menge Entwickler glauben, wenn sie `git fetch` ausführen würden ihre lokalen Branches auf den Stand des entfernten Repositorys gebracht. Es lädt zwar alle Daten herunter, damit man diese Aktualisierung durchführen kann, aber es ändert _nichts_ an deinen lokalen Branches. Wir werden in späteren Level Befehle genau dafür kennenlernen. :D","","Am Ende des Tages kannst du dir `git fetch` also als den Download-Schritt vorstellen."]}},{type:"ModalAlert",options:{markdowns:["Um diesen Level zu schaffen musst du einfach nur `git fetch` ausführen, um alle Commits herunterzuladen!"]}}]},ja:{childViews:[{type:"ModalAlert",options:{markdowns:["## Git Fetch","","リモートGitを用いた作業は、本当にただ単なる他のリポジトリ_への_、または他のリポジトリ_からの_データの転送に集約されます。コミットを転送できる限り、Gitで管理されている全ての種類の更新が共有できます（例えば作業や、新しいファイル、新しいアイデア、ラブレターなどです）。","","このレベルでは、リモートリポジトリ_から_データを取ってくる方法を学びます -- このコマンドは`git fetch`と名付けられています。","","リモートリポジトリの情報を私たちが更新するように、_リモート_ブランチも情報を更新することができることが分かるでしょう。これは前のレッスンでのリモートブランチの働きに結びつきます。"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["`git fetch`の説明に入る前に、その動作を見てみましょう。ここに、ローカルリポジトリにない二個のコミットを含んでいるリモートブランチがあります。"],afterMarkdowns:["やりました！`C2`、`C3`コミットがローカルリポジトリにダウンロードされ、`o/master`リモートブランチに反映されました。"],command:"git fetch",beforeCommand:"git clone; git fakeTeamwork 2"}},{type:"ModalAlert",options:{markdowns:["### fetchとはどのようなものか","","`git fetch`は、主に二つのステップだけで動作します。それは以下のようなものです:","","* リモートにあってローカルリポジトリにないコミットをダウンロードする","* リモートブランチの位置を更新する（例えば、`o/master`）","","`git fetch`は本質的には、_実際_のリモートリポジトリと同じように見えるような形でリモートリポジトリの_ローカル_の情報に同期します（ちょうど今のように）。","","前のレッスンでのことを覚えていると思いますが、リモートブランチはリモートと最後に同期した時点での状態を保持しているという話をしました。`git fetch`はそのリモートと同期する方法なのです！これでリモートブランチと`git fetch`の関係性は明らかになったでしょう？","","`git fetch`は、通常インターネットを通してリモートリポジトリと対話します（`http://`または`git://`プロトコル経由で）。",""]}},{type:"ModalAlert",options:{markdowns:["### fetchがしてくれないもの","","`git fetch`は、しかしながら、_あなたの_ローカルの状態は変更しません。あなたの`master`ブランチや他のもの、今現在のあなたのファイルシステムが見せているものを更新しないのです。","","これは理解する上で重要なことです。なぜなら、多くの技術者は`git fetch`がリモートの状態をローカルの作業場に反映してくれると思っているからです。必要なデータはダウンロードされるかもしれませんが、ローカルのファイルを実際に変更するというようなことは_してくれない_のです。私たちは、この後のレッスンでもこのようなコマンドを学びます :D","","なので、この1日が終わる頃には、あなたは`git fetch`のダウンロードステップの動作が分かるようになるでしょう。"]}},{type:"ModalAlert",options:{markdowns:["このレベルを終えるには、単に`git fetch`を実行し、全てのコミットをダウンロードしてください。"]}}]},ru_RU:{childViews:[{type:"ModalAlert",options:{markdowns:["## Git Fetch","","Работа с удалёнными git репозиториями сводится к передаче данных _в_ и _из_ других репозиториев. До тех пор, пока мы можем отправлять коммиты туда-обратно, мы можем делиться любыми изменениями, которые отслеживает git (следовательно, делиться новыми файлами, свежими идеями, любовными письмами и т.д.).","","В этом уроке вы научитесь тому, как извлекать данные _из_ удалённого репозитория - и для этого у нас есть соответствующая команда `git fetch`.","","Вы увидите, что как только мы изменим представление нашего удалённого репозитория, наши _удалённые_ ветки обновятся соответствующим образом и отобразят это представление. Это связывает воедино предыдущий урок про удалённые репозитории."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Прежде чем углубляться в детали команды `git fetch`, давайте взглянем на её визуализацию в действии! Здесь у нас имеется удалённый репозиторий, который содержит в себе два коммита, отсутствующих в нашем локальном репозитории."],afterMarkdowns:["Вот и всё! Коммиты `C2` и `C3` были успешно скачаны в наш локальный репозиторий, и наша удалённая ветка `o/master` отобразила эти изменения соответствующим образом."],command:"git fetch",beforeCommand:"git clone; git fakeTeamwork 2"}},{type:"ModalAlert",options:{markdowns:["### Что делает fetch","","`git fetch` выполняет две и только две основные операции. А именно:","","* связывается с указанным удалённым репозиторием и забирает все те данные проекта, которых у вас ещё нет, при этом...","* у вас должны появиться ссылки на все ветки из этого удалённого репозитория (например, `o/master`)","","Фактически, `git fetch` синхронизирует _локальное_ представление удалённых репозиториев с тем, что является _актуальным_ на текущий момент времени.","","Насколько вы помните, в предыдущем уроке мы сказали, что удалённые ветки отображают состояние удалённых репозиториев _на тот момент_ когда вы 'общались' с ними в последний раз. `git fetch` является тем механизмом, который даёт вам возможность общаться с удалёнными репозиториями! Надеюсь, что связь между удалёнными ветками и командой `git fetch` теперь прояснилась.","","`git fetch` обычно 'общается' с удалёнными репозиториями посредством Интернета (через такие протоколы, как `http://` или `git://`).",""]}},{type:"ModalAlert",options:{markdowns:["### Чего fetch не делает","","Важно отметить, что команда `git fetch` забирает данные в ваш _локальный_ репозиторий, но не сливает их с какими-либо вашими наработками и не модифицирует то, над чем вы работаете в данный момент.","","Важно это помнить и понимать, потому что многие разработчики думают, что, запустив команду `git fetch`, они приведут всю свою локальную работу к такому же виду, как и на удалённом репозитории. Команда всего лишь скачивает все необходимые данные, но вам потребуется вручную слить эти данные с вашими, когда вы будете готовы. В следующих уроках мы научимся это делать :D","","Одним словом, вы можете относиться к `git fetch` как к процедуре скачивания."]}},{type:"ModalAlert",options:{markdowns:["Чтобы выполнить уровень, просто запустите `git fetch` и скачайте все коммиты!"]}}]},uk:{childViews:[{type:"ModalAlert",options:{markdowns:["## Git Fetch","","Робота з віддаленими git-репозиторіями зводиться до передачі данних _до_ та _з_ інших репозиторіїв. Можливість передавати коміти дозволяє нам ділитися будь-якою інформацією, що відслідковується gitом (а отже, виконаною роботою, новими файлами, ідеями, листами, тощо).","","На цьому уроці ми навчимося витягати дані _з_ віддаленого репозиторію -- команда, що відповідає за це, зручно називається `git fetch` (fetch - англ. витягнути чи дістати).","","Зауваж, що коли ми оновлюємо наш віддалений репозиторій, наші _віддалені_ гілки теж оновляться. Про це ми говорили на попередньому уроці."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Перед тим, як почати розбиратися з `git fetch`, спробуймо його в дії! Тут ми маємо віддалений репозиторій, що містить два коміти, яких немає в нашому локальному сховищі."],afterMarkdowns:["Ось, маєш! Коміти `C2` та `C3` було завантажено до нашого локального сховища й наша віддалена гілка `o/master` була відповідно оновлена."],command:"git fetch",beforeCommand:"git clone; git fakeTeamwork 2"}},{type:"ModalAlert",options:{markdowns:["### Що робить fetch","","`git fetch` виконує дві основні дії, і тільки дві дії. Він:","","* звантажує коміти, які містить віддалене сховище, але яких немає в локальному сховищі, та...","* оновлює посилання віддаленого бранчу (наприклад, `o/master`)","","Якщо коротко, `git fetch` приводить репрезентацію віддаленого репозиторію в локальному сховищі до _актуального_ стану справжнього віддаленого репозиторію.","","Якщо ти пам’ятаєш з попереднього уроку, ми тоді зауважили, що віддалені гілки відображають стан віддаленого репозиторію _від_ останнього разу, коли ми синхронізувались з віддаленим репозиторієм. `git fetch` якраз і відповідає за синхронізацію з віддаленим сховищем! Сподіваюсь, що зв’язок між віддаленими гілками `git fetch` тепер є очевидним.","","Як правило, `git fetch` працює з віддаленими сховищами через інтернет (через протоколи `http://` чи `git://`).",""]}},{type:"ModalAlert",options:{markdowns:["### Чого не робить fetch","","Тим не менш, `git fetch` нічого не змінює в _твоєму_ локальному стані. Він не оновить твою гілку `master` і не змінить того, як наразі виглядає локальна файлова система.","","Це важливо зрозуміти, тому що багато розробників думають, що `git fetch` оновить їхні локальні данні до стану віддаленого репозиторію. Він дійсно звантажить всі потрібні дані, щоб це зробити, але він _не змінить_ автоматично жодних локальних файлів. Ми вивчимо команди, які це роблять, в наступних уроках :D","","Отже, зрештою, ти можеш вважати що `git fetch` просто звантажує нову інформацію з віддаленого сховища."]}},{type:"ModalAlert",options:{markdowns:["Щоб пройти цей рівень просто виконай `git fetch` і звантаж всі коміти!"]}}]},ko:{childViews:[{type:"ModalAlert",options:{markdowns:["## Git Fetch","","git 원격 작업들은 결국 서로다른 저장소에서 데이터를 _주고_ _받는_것에 불과하다는것을 알 수 있습니다. 우리가 커밋들을 주고 받을수 있는 한, git을 바탕으로하는 모든 종류의 업데이트를 공유할 수 있습니다(작업, 새로운 파일들, 새로운 아이디어, 러브레터 등...).","","이번 레슨에서는 원격 저장소_에서_ 데이터를 가져오는 방법을 배워볼 것입니다 -- 이를 위한 명령어는 `git fetch`라고 불립니다.","","먼저 알아두고 넘어갈것이 있는데 우리가 원격 저장소와 작업을 해서 상태가 변하면 _원격_브랜치들 또한 그 변경들을 반영합니다. 원격 브랜치에대한 이전 레슨을 참고하세요."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["`git fetch`의 세부사항을 알아보기 전에 일단 눈으로 먼저 확인해 봅시다! 여기 로컬 저장소에는 없는 두개의 커밋이 있는 원격 저장소가 있습니다."],afterMarkdowns:["됐습니다! 커밋 `C2` 와 `C3`가 우리의 로컬 저장소로 다운로드 되었고, 원격 브랜치 `o/master`가 이것을 반영하기 위해 업데이트 되었습니다."],command:"git fetch",beforeCommand:"git clone; git fakeTeamwork 2"}},{type:"ModalAlert",options:{markdowns:["### fetch는 무엇을 하는가","","`git fetch`는 두가지의 중요한 단계를 수행합니다. 사실 이 두 단계만을 진행합니다. 그것은 :","","* 원격 저장소에는 있지만 로컬에는 없는 커밋들을 다운로드 받습니다. 그리고... ","* 우리의 원격 브랜치가 가리키는곳을 업데이트합니다 (예를들어, `o/master`)","","`git fetch`는 본질적으로 _로컬_에서 나타내는 원격 저장소의 상태를 _실제_ 원격 저장소의 (지금)상태와 동기화합니다.","","이전 레슨을 기억한다면, 원격 브랜치는 가장 최근 원격 원격저장소와 작업을 했을때를 기준으로 원격 저장소의 상태를 반영한다고 했습니다. `git fetch`가 그러한 작업중에 하나입니다!(역: 원문에서는 talk with remote라고 표현합니다. 원격 저장소와 대화한다고 번역하기 어색해서 의역했습니다.) 원격 브랜치와 `git fetch`의 관계를 분명하게 알게되셨으면 좋겠습니다.","","`git fetch`는 일반적으로 원격 저장소와 인터넷을 통해 접근합니다(`http://` 또는 `git://`와같은 프로토콜로).",""]}},{type:"ModalAlert",options:{markdowns:["### fetch는 무엇을 하지 않는가","","`git fetch`는 그러나, _여러분의_ 로컬 상태는 전혀 바꾸지 않는습니다. 여러분의 `master` 브랜치도 업데이트하지 않고 파일 시스템의 모습이던 그 어떤것도 바꾸지 않습니다.","","이것을 이해하는게 아주 중요한데, 왜냐하면 수 많은 개발자들이 `git fetch`를 하면 자신의 로컬 작업이 변경되어 원격 저장소의 모습을 반영해 업데이트 될것이라고 생각하기 때문입니다. 앞의 과정에 필요한 데이터를 다운로드는 하지만, 실제로 로컬 파일들이나 브랜치를 변경하지는 않습니다. 이것을 하기위한 명령어들은 뒤에서 배우겠습니다 :D","","간단하게 `git fetch`를 다운로드 단계로 생각할 수 있습니다."]}},{type:"ModalAlert",options:{markdowns:["레벨을 마치기 위해, `git fetch`를 수행하고 모든 커밋들을 내려 받으세요!"]}}]},vi:{childViews:[{type:"ModalAlert",options:{markdowns:["## Git Fetch","","Lam việc với git remote về căn bản là chuyển giao dữ liệu _qua_ và _lại_ giữa các kho chứa. Miễn là ta có thể chia sẻ qua lại các commit, ta có thể chia sẻ bất kỳ cập nhật gì được theo dõi bở git (và từ đó chia sẻ thành quả, tập tin mới, ý tưởng mới, thư tình, các kiểu con đà điểu.).","","Ở bài học này ta sẽ học cách lấy dữ liệu về _từ_ một kho chứa từ xa -- lệnh đó là `git fetch`.","","Bạn sẽ nhận thấy rằng khi ta cập nhật đại điện kho chứa từ xa, Nhánh _từ xa_ của ta cũng được cập nhật để phản ánh đại diện đó. Điều này liên quan đến bài học trước về nhánh từ xa"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Trước khi đi vào chi tiết về `git fetch`, hãy xem cách nó hoạt động! Ở đây ta có một kho chứa từ xa trong đó chứa 2 commit mà kho chứa địa phương của ta không có."],afterMarkdowns:["Đó! Commit `C2` và `C3` đã được tải xuống kho chứa cục bộ của ta, và nhánh từ xa `o/master` của ta đã được cập nhật để phản ánh điều này."],command:"git fetch",beforeCommand:"git clone; git fakeTeamwork 2"}},{type:"ModalAlert",options:{markdowns:["### Fetch làm gì","","`git fetch` thực hiện 2 bước chính, và chỉ 2 bước chính. Nó:","","* tải xuống commit có trên kho chứa từ xa mà kho chứa cục bộ của ta không có, và...","* cập nhật nơi mà nhánh từ xa của ta trỏ tới (ví dụ nhánh `o/master`)","","Về căn bản thì `git fetch` đưa đại diện _địa phương_ của kho chứa từ xa của ta về trạng thái đồng bộ với trạng thái _thực tế_ của kho chứa từ xa (ngay lúc này).","","Nếu bạn còn nhớ thì trong bài học trước, chúng tôi có đề cập rằng nhánh từ xa phản ánh trạng thái của kho chứa từ xa _kể từ_ kể từ lần cuối bạn tương tác với các nhánh từ xa đó. `git fetch` chính là cách để tương tác với cách nhánh từ xa! Hi vọng chúng tôi đã làm sáng tỏ sự liên kết giữa nhánh từ xa và `git fetch`.","","`git fetch` thường tương tác với kho chứa từ xa bằng Internet (thông qua các giao thức như `http://` hoặc `git://`).",""]}},{type:"ModalAlert",options:{markdowns:["### fetch không làm gì","","Tuy nhiên, `git fetch` không hề thay đổi trạng thái kho chứa _địa phương_ của bạn. Nó sẽ không cập nhật nhánh `master` hay thay đổi bất kỳ điều gì trong hệ thống tập tin hiện tại của bạn.","","Điều này rất quan trọng, vì nhiều nhà phát triển nghĩ rằng `git fetch` sẽ làm kho chứa địa phương của họ phản ánh trạng thái của kho chúa từ xa. Nó có thể tải xuống tất cả dữ liệu cần thiết, nhưng nó thực tế _không_ thay đổi bất cứ thứ gì trên tập tin địa phương của bạn. Ta sẽ học lệnh để làm điều đó sau :D","","Nói tóm lại, bạn có thể coi `git fetch` thuần túy như một bước tải xuống."]}},{type:"ModalAlert",options:{markdowns:["Để hoàn thành cấp độ này, đơn giản hãy gõ `git fetch` để tải xuống tất cả commit!"]}}]}}}},{}],134:[function(e,t,o){o.level={goalTreeString:'{"branches":{"master":{"target":"C6","id":"master","remoteTrackingBranchID":"o/master"},"foo":{"target":"C7","id":"foo","remoteTrackingBranchID":"o/foo"},"o/master":{"target":"C1","id":"o/master","remoteTrackingBranchID":null},"o/foo":{"target":"C1","id":"o/foo","remoteTrackingBranchID":null}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"},"C2":{"parents":["C1"],"id":"C2"},"C3":{"parents":["C2"],"id":"C3"},"C5":{"parents":["C1"],"id":"C5"},"C6":{"parents":["C5"],"id":"C6"},"C7":{"parents":["C3","C6"],"id":"C7"}},"HEAD":{"target":"foo","id":"HEAD"},"originTree":{"branches":{"master":{"target":"C4","id":"master","remoteTrackingBranchID":null},"foo":{"target":"C6","id":"foo","remoteTrackingBranchID":null}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"},"C2":{"parents":["C1"],"id":"C2"},"C3":{"parents":["C2"],"id":"C3"},"C4":{"parents":["C3"],"id":"C4"},"C5":{"parents":["C1"],"id":"C5"},"C6":{"parents":["C5"],"id":"C6"}},"HEAD":{"target":"foo","id":"HEAD"}}}',solutionCommand:"git fetch origin master~1:foo;git fetch origin foo:master;git checkout foo;git merge master",startTree:'{"branches":{"master":{"target":"C1","id":"master","remoteTrackingBranchID":"o/master"},"foo":{"target":"C1","id":"foo","remoteTrackingBranchID":"o/foo"},"o/master":{"target":"C1","id":"o/master","remoteTrackingBranchID":null},"o/foo":{"target":"C1","id":"o/foo","remoteTrackingBranchID":null}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"}},"HEAD":{"target":"C1","id":"HEAD"},"originTree":{"branches":{"master":{"target":"C4","id":"master","remoteTrackingBranchID":null},"foo":{"target":"C6","id":"foo","remoteTrackingBranchID":null}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"},"C2":{"parents":["C1"],"id":"C2"},"C3":{"parents":["C2"],"id":"C3"},"C4":{"parents":["C3"],"id":"C4"},"C5":{"parents":["C1"],"id":"C5"},"C6":{"parents":["C5"],"id":"C6"}},"HEAD":{"target":"foo","id":"HEAD"}}}',name:{en_US:"Fetch arguments",fr_FR:"Arguments de fetch",zh_CN:"Git fetch 的参数",zh_TW:"fetch 的參數",es_AR:"Parámetros de fetch",es_ES:"Parámetros de fetch",pt_BR:"Parâmetros do fetch",gl:"Parámetros de fetch",de_DE:"Optionen für Fetch",ja:"Fetchの引数",ru_RU:"Аргументы для fetch",ko:"Fetch의 인자들",uk:"Аргументи для fetch",vi:"Tham số fetch"},hint:{en_US:'Pay attention how the commit ids may have swapped! You can read slides again with "help level"',fr_FR:'Faites attention à la façon dont les ids des commits ont été intervertis ! Vous pouvez lire une nouvelle fois les slides avec "help level"',zh_CN:"注意下提交对象的 id 是如何交换的! 你可以通过 `help level` 重新阅读本关卡的所有对话框!",zh_TW:"注意 commit 的 id 是怎麼被交換的！你可以透過 `help level` 來閱讀對話視窗！",es_AR:'¡Prestá atención a cómo podrían haberse invertido los ids de los commits! Podés volver a leer toda la lección usando "help level"',es_ES:'¡Presta atención a cómo podrían haberse invertido los ids de los commits! Puedes volver a leer toda la lección usando "help level"',pt_BR:'Preste atenção em como os identificadores dos commits podem ter trocado! Você pode ler os slides novamente com "help level"',gl:'Preste atención en como poderían invertirse os ids dos commits! Podes volver ler toda a lección usando "help level"',de_DE:'Beachte wie die Commit IDs getauscht wurden! Du kannst den Einführungsdialog mit "help level" erneut anzeigen',ja:"コミットIDの入れ替わりに注意！スライドを復習するには`help level`を実行",ru_RU:'Обратите внимание на то, как номера коммитов могут меняться! Вы можете прочесть слайды вновь, воспользовавшись командой "help level"',ko:'커밋 ID가 바뀔수도있으니 주의하세요! "help level"을 입력하면 슬라이드들을 다시 읽어볼수 있습니다.',uk:'Зверни увагу на те, що номери комітів можуть змінюватися! Слайди уроку можна переглянути ще раз командою "help level"',vi:'Lưu ý id của các commit bị tráo đổi, bạn có thể dùng "help level" để đọc lại hội thoại'},startDialog:{en_US:{childViews:[{type:"ModalAlert",options:{markdowns:["## Git fetch arguments","","So we've just learned all about git push arguments, this cool `<place>` parameter, and even colon refspecs (`<source>:<destination>`). Can we use all this knowledge for `git fetch` as well?","","You betcha! The arguments for `git fetch` are actually *very, very* similar to those for `git push`. It's the same type of concepts but just applied in the opposite direction (since now you are downloading commits rather than uploading).","","Let's go over the concepts one at a time..."]}},{type:"ModalAlert",options:{markdowns:["### The `<place>` parameter","","If you specify a place with git fetch like in the following command:","","`git fetch origin foo`","","Git will go to the `foo` branch on the remote, grab all the commits that aren't present locally, and then plop them down onto the `o/foo` branch locally.","","Let's see this in action (just as a refresher)."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["By specifying a place..."],afterMarkdowns:["We download only the commits from `foo` and place them on `o/foo`"],command:"git fetch origin foo",beforeCommand:"git branch foo; git clone; git fakeTeamwork foo 2"}},{type:"ModalAlert",options:{markdowns:["You might be wondering -- why did git plop those commits onto the `o/foo` remote branch rather than just plopping them onto my local `foo` branch? I thought the `<place>` parameter is a place that exists both locally and on the remote?","","Well git makes a special exception in this case because you might have work on the `foo` branch that you don't want to mess up!! This ties into the earlier lesson on `git fetch` -- it doesn't update your local non-remote branches, it only downloads the commits (so you can inspect / merge them later).",""]}},{type:"ModalAlert",options:{markdowns:['"Well in that case, what happens if I explicitly define both the source and destination with `<source>:<destination>`?"',"","If you feel passionate enough to fetch commits *directly* onto a local branch, then yes you can specify that with a colon refspec. You can't fetch commits onto a branch that is checked out, but otherwise git will allow this.","","Here is the only catch though -- `<source>` is now a place on the *remote* and `<destination>` is a *local* place to put those commits. It's the exact opposite of git push, and that makes sense since we are transferring data in the opposite direction!","","That being said, developers rarely do this in practice. I'm introducing it mainly as a way to conceptualize how `fetch` and `push` are quite similar, just in opposite directions."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Let's see this craziness in action:"],afterMarkdowns:["Wow! See, git resolved `foo~1` as a place on the origin and then downloaded those commits to `bar` (which was a local branch). Notice how `foo` and `o/foo` were not updated since we specified a destination."],command:"git fetch origin foo~1:bar",beforeCommand:"git branch foo; git clone; git branch bar; git fakeTeamwork foo 2"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["What if the destination doesn't exist before I run the command? Let's see the last slide but without `bar` existing beforehand."],afterMarkdowns:["See, it's JUST like git push. Git made the destination locally before fetching, just like git will make the destination on remote before pushing (if it doesn't exist)."],command:"git fetch origin foo~1:bar",beforeCommand:"git branch foo; git clone; git fakeTeamwork foo 2"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["No args?","","If `git fetch` receives no arguments, it just downloads all the commits from the remote onto all the remote branches..."],afterMarkdowns:["Pretty simple, but worth going over just once."],command:"git fetch",beforeCommand:"git branch foo; git clone; git fakeTeamwork foo; git fakeTeamwork master"}},{type:"ModalAlert",options:{markdowns:["Ok, enough talking! To finish this level, fetch just the specified commits in the goal visualization. Get fancy with those commands!","","You will have to specify the source and destination for both fetch commands. Pay attention to the goal visualization since the IDs may be switched around!"]}}]},fr_FR:{childViews:[{type:"ModalAlert",options:{markdowns:["## Les arguments de git fetch","","Nous savons maintenant tout ce qu'il y a à savoir sur les arguments de git push, y compris le paramètre `<place>` et la ponctuation pour refspecs (`<source>:<destination>`). Pouvons-nous utiliser ces connaissances avec `git fetch` également ?","","Bien sûr ! Les arguments de `git fetch` sont en fait *très, très* similaires à ceux de `git push`. Il s'agit des mêmes concepts mais simplement appliqués dans le sens opposé (puisque maintenant vous récupérez des commits plutôt que de les envoyer).","","Voyons ces concepts un par un..."]}},{type:"ModalAlert",options:{markdowns:["### Le paramètre `<place>`","","Si vous spécifiez un emplacement à git fetch, comme dans la commande suivante :","","`git fetch origin foo`","","Git va aller à la branche distante `foo`, récupérer tous les commits qui ne sont pas présents localement, puis les rapatrier dans la branche locale `o/foo`.","","Voyons cela en action (juste pour réviser)."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["En spécifiant un emplacement..."],afterMarkdowns:["Nous téléchargeons uniquement les commits de `foo` et les plaçons dans `o/foo`."],command:"git fetch origin foo",beforeCommand:"git branch foo; git clone; git fakeTeamwork foo 2"}},{type:"ModalAlert",options:{markdowns:["Vous vous posez peut-être la question : pourquoi git a-t-il fait apparaître ces commits dans la branche distante `o/foo` plutôt que les placer directement dans ma branche locale `foo` ? Je croyais que le paramètre `<place>` était un emplacement qui existait à la fois localement et sur le dépôt distant ?","","En fait git fait une exception dans ce cas parce que vous pourriez avoir du travail en cours dans la branche `foo` que vous ne voulez pas écraser !! Cela provient de ce que nous avions vu dans la leçon précédente sur `git fetch` : cette commande ne met pas à jour vos branches locales, elle télécharge uniquement les commits (pour que vous puissiez les inspecter et/ou les fusionner plus tard).",""]}},{type:"ModalAlert",options:{markdowns:['"Bon, mais dans ce cas, que se passe-t-il si je spécifie explicitement la source et la destination avec `<source>:<destination>` ?"',"","Si vous vous sentez assez déterminé pour rapatrier (fetch) des commits *directement* dans votre branche locale, alors oui vous pouvez préciser cela avec la notation refspec. Vous ne pouvez cependant pas rapatrier les commits dans la branche courante.","","Il y a un petit piège cependant : dans ce cas précis `<source>` est l'emplacement sur le dépôt *distant* et `<destination>` l'emplacement sur le dépôt *local* où seront placés ces commits. C'est l'exact opposé de git push, et cela se tient puisque nous transférons des données dans le sens opposée !","","Cela dit, les développeurs utilisent rarement cette syntaxe en pratique. Je l'introduis principalement pour concrétiser le fait que `fetch` et `push` sont très similaires, fonctionnant simplement dans des sens opposées."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Voyons ce délire en action :"],afterMarkdowns:["Wow ! Vous voyez, git a résolu `foo~1` comme un emplacement sur origin et a ensuite téléchargé les commits dans `bar` (qui était une branche locale). Remarquez aussi que `foo` et `o/foo` n'ont pas été mises à jour puisque nous avons spécifié une destination."],command:"git fetch origin foo~1:bar",beforeCommand:"git branch foo; git clone; git branch bar; git fakeTeamwork foo 2"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Que se passe-t-il si l'emplacement n'existe pas avant que j'exécute la commande ? Voyons cela dans ce dernier slide, en nous mettant dans la situation où `bar` n'existe pas encore."],afterMarkdowns:["Vous voyez, c'est COMME un git push. Git a créé la destination localement avant le fetch, exactement comme avec push il crée au préalable la destination sur le dépôt distant (si elle n'existe pas)."],command:"git fetch origin foo~1:bar",beforeCommand:"git branch foo; git clone; git fakeTeamwork foo 2"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Pas d'arguments ?","","Si `git fetch` ne reçoit pas d'arguments, cela télécharge simplement tous les commits du dépôt distant au sein de toutes les branches distantes..."],afterMarkdowns:["Assez simple, mais ce n'était pas inutile de voir en action."],command:"git fetch",beforeCommand:"git branch foo; git clone; git fakeTeamwork foo; git fakeTeamwork master"}},{type:"ModalAlert",options:{markdowns:["Ok, assez parlé ! Pour finir ce niveau, faites simplement un fetch des commits indiqués dans la fenêtre de visualisation de l'objectif. Faites-vous plaisir !","","Vous devrez préciser la source et la destination pour les deux commandes fetch. Faites attention à l'objectif puisque les IDs peuvent avoir été intervertis !"]}}]},es_AR:{childViews:[{type:"ModalAlert",options:{markdowns:["## Parámetros de git fetch","","Entonces, recién aprendimos todo sobre los parámetros de push, este parámetro `<lugar>` copado, e incluso las referencias separadas por dos puntos (`<origen>:<destino>`). ¿Podremos usar todo ese conocimiento para `git fetch`, también?","","¡Dalo por hecho! Los parámetros para `git fetch` son realmente *muy, muy* similares a los de `git push`. Es el mismo tipo de conceptos, pero aplicados en la dirección opuesta (dado que ahora estás bajando commits en lugar de subirlos).","","Veamos los conceptos de a uno a la vez..."]}},{type:"ModalAlert",options:{markdowns:["### El parámetro `<lugar>`","","Si especificás un lugar con git fetch como en el comando siguiente:","","`git fetch origin foo`","","Git va a ir a la rama `foo` en el remoto, va a traer todos los commits que no estén presentes localmente, y luego los aplicará sobre la rama `o/foo` localmente.","","Veámoslo en acción (refresquemos el concepto)."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Especificando un lugar..."],afterMarkdowns:["Sólo bajamos los commits de `foo` y los ubicamos en `o/foo`"],command:"git fetch origin foo",beforeCommand:"git branch foo; git clone; git fakeTeamwork foo 2"}},{type:"ModalAlert",options:{markdowns:['Te podrás estar preguntando "¿Por qué git aplicó esos commits sobre la rama `origin/foo` en lugar de aplicarlos sobre la rama `foo` local? Pensé que el parámetro `<lugar>` era un lugar que existía tanto local como remotamente"',"","Bueno, git hace una excepción especial en este caso, porque vos podrías tener trabajo en la rama `foo` que no quieras mezclar. Esto refiere a la lección anterior sobre `git fetch` - no actualiza tus ramas locales no-remotas, sólo descarga los commits (para que pueadas verlos o mergearlos después).",""]}},{type:"ModalAlert",options:{markdowns:['"Bueno, y, en ese caso, ¿qué pasa si explícitamente defino el origen y destino con `<origen>:<destino>`?"',"","Si te sentís lo suficientemente seguro como para traer commits *directamente* a una rama local, entonces, sí, podés especificarlo usando una referencia con dos puntos. No podés traer commits a una rama que tengas checkouteada, pero en cualquier otro caso git te lo va a permitir.","","Este es el único problemita, igual: `<origen>` es ahora un lugar en el *remoto*, y `<destino>` es un lugar *local* en donde poner esos commits. Es exactamente lo opuesto a git push, y eso tiene sentido dado que ¡estamos transfiriendo los datos en la dirección opuesta!","","Habiendo dicho esto, difícilmente alguien use esto en la práctica. Lo estoy presentando principalmente como un modo de conceptualizar que `fetch` y `push` son bastante similares, sólo que en direcciones opuestas."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Veamos esta locura en acción:"],afterMarkdowns:["¡Wow! Mirá: git resolvió `foo~1` como un lugar en el origin y bajó esos commits a `bar` (que era una rama local). Notá como `foo` y `o/foo` no fueron actualizados, dado que especificamos un destino."],command:"git fetch origin foo~1:bar",beforeCommand:"git branch foo; git clone; git branch bar; git fakeTeamwork foo 2"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["¿Qué pasa si el destino no existe antes de que corra este comando? Veamos el último ejemplo pero sin que `bar` exista de antemano."],afterMarkdowns:["Mirá: es IGUAL que git push. Git creó el destino localmente antes de hacer el fetch, tal como git creará el destino en el remoto antes de pushear (si no existiera)."],command:"git fetch origin foo~1:bar",beforeCommand:"git branch foo; git clone; git fakeTeamwork foo 2"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["¿Sin argumentos?","","Si `git fetch` no recibe ningún argumento, simplemente descarga todos los commits del remoto a todas las ramas remotas..."],afterMarkdowns:["Bastante simple, pero vale la pena verlo al menos una vez."],command:"git fetch",beforeCommand:"git branch foo; git clone; git fakeTeamwork foo; git fakeTeamwork master"}},{type:"ModalAlert",options:{markdowns:["Bueno, demasiada charla. Para completar este nivel, fetcheáte sólo los commits especificados en la visualización del objetivo. ¡Amigate con esos comandos!","","Vas a tener que especificar el origen y el destino para ambos comandos fetch. Prestá atención al objetivo dado que ¡los IDs pueden estar invertidos!"]}}]},es_ES:{childViews:[{type:"ModalAlert",options:{markdowns:["## Parámetros de git fetch","","Acabamos de aprender todo sobre los parámetros de push, como el parámetro `<lugar>`, e incluso las referencias separadas por dos puntos (`<origen>:<destino>`). ¿Podremos usar todo ese conocimiento para `git fetch`, también?","","¡Dalo por hecho! Los parámetros para `git fetch` son realmente *muy, muy* similares a los de `git push`. Es el mismo tipo de conceptos, pero aplicados en la dirección opuesta (dado que ahora estás bajando commits en lugar de subirlos).","","Veamos los conceptos de a uno en uno..."]}},{type:"ModalAlert",options:{markdowns:["### El parámetro `<lugar>`","","Si especificas un lugar con git fetch como en el comando siguiente:","","`git fetch origin foo`","","Git va a ir a la rama `foo` en el remoto, va a traer todos los commits que no estén presentes localmente, y luego los aplicará sobre la rama `o/foo` localmente.","","Veámoslo en acción (refresquemos el concepto)."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Especificando un lugar..."],afterMarkdowns:["Sólo bajamos los commits de `foo` y los ubicamos en `o/foo`"],command:"git fetch origin foo",beforeCommand:"git branch foo; git clone; git fakeTeamwork foo 2"}},{type:"ModalAlert",options:{markdowns:['Te podrás estar preguntando "¿Por qué git aplicó esos commits sobre la rama `origin/foo` en lugar de aplicarlos sobre la rama `foo` local? Pensé que el parámetro `<lugar>` era un lugar que existía tanto local como remotamente"',"","Bueno, git hace una excepción especial en este caso, porque podrías tener trabajo en la rama `foo` que no quieras mezclar. Esto hace referencia a la lección anterior sobre `git fetch` - no actualiza tus ramas locales no-remotas, sólo descarga los commits (para que pueadas verlos o mergearlos después).",""]}},{type:"ModalAlert",options:{markdowns:['"Bueno, y, en ese caso, ¿qué pasa si explícitamente defino el origen y destino con `<origen>:<destino>`?"',"","Si te sientes lo suficientemente seguro como para traer commits *directamente* a una rama local, entonces, sí, puedes especificarlo usando una referencia con dos puntos. No puedes traer commits a una rama que sobre la que hayas hecho checkout, pero en cualquier otro caso git te lo va a permitir.","","Este es el único problema, igual: `<origen>` es ahora un lugar en el *remoto*, y `<destino>` es un lugar *local* en donde poner esos commits. Es exactamente lo opuesto a git push, y eso tiene sentido dado que ¡estamos transfiriendo los datos en la dirección opuesta!","","Habiendo dicho esto, difícilmente alguien use esto en la práctica. Lo estoy presentando principalmente como un modo de conceptualizar que `fetch` y `push` son bastante similares, sólo que en direcciones opuestas."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Veamos esta locura en acción:"],afterMarkdowns:["¡Caramba! Mira: git resolvió `foo~1` como un lugar en el origin y bajó esos commits a `bar` (que era una rama local). Observa como `foo` y `o/foo` no fueron actualizados, dado que especificamos un destino."],command:"git fetch origin foo~1:bar",beforeCommand:"git branch foo; git clone; git branch bar; git fakeTeamwork foo 2"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["¿Qué pasa si el destino no existe antes de ejecutar este comando? Veamos el último ejemplo pero sin que `bar` exista de antemano."],afterMarkdowns:["Mira: es IGUAL que git push. Git creó el destino localmente antes de hacer el fetch, tal como git creará el destino en el remoto antes de hacer push (si no existiera)."],command:"git fetch origin foo~1:bar",beforeCommand:"git branch foo; git clone; git fakeTeamwork foo 2"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["¿Sin argumentos?","","Si `git fetch` no recibe ningún argumento, simplemente descarga todos los commits del remoto a todas las ramas remotas..."],afterMarkdowns:["Bastante simple, pero merece la pena verlo al menos una vez."],command:"git fetch",beforeCommand:"git branch foo; git clone; git fakeTeamwork foo; git fakeTeamwork master"}},{type:"ModalAlert",options:{markdowns:["Bueno, demasiada charla. Para completar este nivel, haz fetch sólo de los commits especificados en la visualización del objetivo. ¡Familiarízate con esos comandos!","","Vas a tener que especificar el origen y el destino para ambos comandos fetch. Presta atención al objetivo dado que ¡los IDs pueden estar invertidos!"]}}]},pt_BR:{childViews:[{type:"ModalAlert",options:{markdowns:["## Parâmetros do git fetch","","Então acabamos de aprender tudo sobre os parâmetros do git push, inclusive sobre esse parâmetro bacana chamado `<lugar>`, e até mesmo sobre colon refspecs (`<origem>:<destino>`). Será que poderíamos aplicar todo esse conhecimento também ao `git fetch`?","","Você adivinhou! Os parâmetros do `git fetch` são na verdade *muito, muito* similares aos do `git push`. Trata-se do mesmo tipo de conceito, só que aplicado na direção oposta (já que agora é um download em vez de um upload).","","Vamos aos conceitos um por vez..."]}},{type:"ModalAlert",options:{markdowns:["### O parâmetro `<lugar>`","","Se você passar um lugar ao git fetch, como no seguinte comando:","","`git fetch origin foo`","","O Git vai ao ramo remoto `foo` e pega todos os commits que não estão presentes localmente, jogando-os no ramo local `o/foo`.","","Vejamo-lo em ação (só para refrescar a memória)."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Especificando um lugar..."],afterMarkdowns:["Baixamos só os commits de `foo` e colocamos em `o/foo`"],command:"git fetch origin foo",beforeCommand:"git branch foo; git clone; git fakeTeamwork foo 2"}},{type:"ModalAlert",options:{markdowns:["Você pode estar se perguntando -- por que o Git colocou os commits no ramo remoto `o/foo` em vez de simplesmente jogá-los no meu ramo local `foo`? Eu pensei que o parâmetro fosse um `<lugar>` que existisse tanto no repositório local como no remoto?","","Bem, o Git tem uma exceção especial neste caso, porque pode ser que exista trabalho seu no ramo local `foo` que você não queira bagunçar!! Esse fato é relacionado com o abordado na lição anterior sobre o `git fetch` -- ele não atualiza ramos locais não-remotos, ele apenas baixa os commits (de forma que você possa inspecioná-los e/ou realizar um merge posteriormente).",""]}},{type:"ModalAlert",options:{markdowns:['"Bem, neste caso, o que acontece se eu definir explicitamente tanto a origem como o destino, com `<origem>:<destino>`?"',"","Se você estiver apaixonado o suficiente para baixar commits *diretamente* em um ramo local, então sim, você pode especificar esse comportamento com um colon refspec. Você só não pode baixar commits em um ramo que esteja atualmente em checkout, mas se não estiver, o Git permitirá o fetch.","","Aqui está o único detalhe -- `<origem>` agora é uma referência *remota* e `<destino>` é uma referência *local* de onde colocar esses commits. É exatamente o oposto do git push, e realmente faz sentido, já que estamos transferindo os dados na direção oposta!","","Tendo dito isto, desenvolvedores raramente fazem isso na prática. Estou introduzindo essa informação mais como uma forma de conceitualizar a forma como `fetch` e `push` são tão similares, apenas em direções opostas."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Vejamos essa loucura em ação:"],afterMarkdowns:["Wow! Viu, o Git entendeu o `foo~1` como um lugar de origin e baixou os commits para o ramo local `bar`. Veja como `foo` e `o/foo` não foram atualizados, já que especificamos outro destino."],command:"git fetch origin foo~1:bar",beforeCommand:"git branch foo; git clone; git branch bar; git fakeTeamwork foo 2"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["E se o destino não existir antes de eu executar o comando? Vamos rever o último slide, mas em uma situação na qual o `bar` não existe de antemão."],afterMarkdowns:["Viu? Funciona EXATAMENTE como o git push. O Git criou o destino localmente antes do fetch, da mesma forma como o Git cria o destino (se ele não existir) no repositório remoto durante um push."],command:"git fetch origin foo~1:bar",beforeCommand:"git branch foo; git clone; git fakeTeamwork foo 2"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Sem parâmetros?","","Se o `git fetch` não receber argumentos, ele simplesmente baixa todos os commits do repositório remoto em todos os ramos remotos..."],afterMarkdowns:["Bastante simples, mas importante de rever ao menos uma vez."],command:"git fetch",beforeCommand:"git branch foo; git clone; git fakeTeamwork foo; git fakeTeamwork master"}},{type:"ModalAlert",options:{markdowns:["Ok, chega de conversa! Para completar este nível, faça fetch apenas dos commits especificados na visualização do objetivo. Capriche nos comandos!","","Você terá de especificar tanto a origem como o destino em ambos os comandos de fetch. Preste atenção na janela de visualização, já que os identificadores podem trocar!"]}}]},gl:{childViews:[{type:"ModalAlert",options:{markdowns:["## Parámetros de fetch","","Entonces, aprendido todo sobre os parámetros de push, este parámetro `<lugar>` molón, e incluso as referencias separadas por dous puntos (`<orixe>:<destino>`). ¿Poderemos empregar todo este coñecemento para `git fetch` tamén?","","¡Home claro! Os parámetros para `git fetch` son realmente *moi, moi* semellantes os de `git push`. É o mesmo tipo de conceptos, pero aplicados na dirección contraria (xa que agora estás baixando os commits en lugar de subilos).","","Vexamos os conceptos dunha puntada..."]}},{type:"ModalAlert",options:{markdowns:["### O parámetro `<lugar>`","","Se especificar o lugar co git fetch como no comando seguinte:","","`git fetch origin foo`","","Git vai ir á rama `foo` no remoto, vai traer tódolos commits que non estén presentes localmente, e logo aplicaráos sobre a rama `o/foo` localmente.","","Vexámolo en acción (refresquemos o concepto)."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Especificando un lugar..."],afterMarkdowns:["Sólo baixamos os commits de `foo` e os poñemos en `o/foo`"],command:"git fetch origin foo",beforeCommand:"git branch foo; git clone; git fakeTeamwork foo 2"}},{type:"ModalAlert",options:{markdowns:['Poderás preguntarte "¿Por qué git aplicou eses commits sobre a rama `origin/foo` e non os aplicou sobre a rama `foo` local? Lembra que o parámetro `<lugar>` era un lugar que existía tanto no local como no remoto."',"","Bueno, git fai unha excepción especial neste caso, xa que poderías ter traballo na rama `foo` que non quixeras mesturar. Esto refírese á lección anterior sobre `git fetch` - non actualiza as túas ramas locais non-remotas, só descarga os commits (para que poidas velos ou mesturalos despois).",""]}},{type:"ModalAlert",options:{markdowns:['"Bueno, e, neste caso, ¿qué pasa se explícitamente definimos o orixe e destino con `<origen>:<destino>`?"',"","Se te sentes o suficientemente seguro como para traer os commits *directamente* da rama local, entón, sí, podes especificalo empregando a referencia con dous puntos. Non podes traer commits a unha rama que non teñas, pero en calquera outro caso, git vaino facer.","","Este é o único problema, igual: `<orixe>` é agora un lugar no *remoto*, e `<destino>` é un lugar *local* onde poñer esos commits. É exactamente o oposto a git push, e eso ten sentido xa que ¡estamos enviando os datos no sentido contrario!","","Dito esto, difícilmente alguén use esto na práctica. Estouno presentando principalmente como un modo de traballar no que `fetch` e `push` son moi semellantes, só que en direccións opostas."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Vexamos esta locura en acción"],afterMarkdowns:["¡Wow! Mira: git resolveu `foo~1` como un lugar no que a orixe descargou eses commits a `bar` (que era unha rama local). Nota como `foo` e `o/foo` non foron actualizados, xa que especificamos o destino."],command:"git fetch origin foo~1:bar",beforeCommand:"git branch foo; git clone; git branch bar; git fakeTeamwork foo 2"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["¿Qué pasa si o destino non existe antes de lanzar este comando? Vexamos o último exemplo pero sin que `bar` exista de antemán."],afterMarkdowns:["Mira: é IGUAL que git push. Git creou o destino localmente antes de facer o fetch, tal e como git creará o destino no remoto antes de empurrar (se non existiran)."],command:"git fetch origin foo~1:bar",beforeCommand:"git branch foo; git clone; git fakeTeamwork foo 2"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["¿Sen argumentos?","","Se `git fetch` non recibe ningún argumento, simplemente descarga tódolos commits do remoto a tódalas ramas remotas..."],afterMarkdowns:["Moi sinxelo, pero vale a pena velo ó menos unha vez."],command:"git fetch",beforeCommand:"git branch foo; git clone; git fakeTeamwork foo; git fakeTeamwork master"}},{type:"ModalAlert",options:{markdowns:["Bueno, moitas verbas. Para rematar o nivel, descarga só os commits especificados na visualización do obxectivo. ¡Faite colega destes comandos!","","Vas ter que especificar a orixe e o destino para ámbolos dous comandos fetch. Presta atención ó objetivo dado que ¡os IDs poden estar invertidos!"]}}]},zh_TW:{childViews:[{type:"ModalAlert",options:{markdowns:["## git fetch 的參數","","我們剛學到了所有關於 git push 的參數，有非常棒的 `<place>` 參數，甚至是 colon refspecs（`<source>:<destination>`），我們可不可以也同樣套用到 `git fetch` 上面？","","你猜對了！`git fetch` 的參數*非常非常*類似 `git push`，一樣的概念，但方向不同（因為你在下載 commit，而不是在上傳 commit）。","","讓我們一次講一個概念..."]}},{type:"ModalAlert",options:{markdowns:["###`<place>` 參數","","對於 `git fetch`，如果你特別指定了一個 `<place>`：","","`git fetch origin foo`","","git 會到 remote 上的 `foo` branch，抓下所有不在 local 上的 commit，然後將它們放到 local 的 `o/foo` branch。","","讓我們實際看一下（就只是一個*更新*的方法）。"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["指定一個 `<place>`..."],afterMarkdowns:["我們只下載了 `foo` 上的 commit，並且把它們放到 `o/foo`。"],command:"git fetch origin foo",beforeCommand:"git branch foo; git clone; git fakeTeamwork foo 2"}},{type:"ModalAlert",options:{markdowns:["你也許會感到奇怪，為什麼 git 是把這些 commit 放到 `o/foo` branch 而不是放到我的 local 的 `foo` branch？ 我認為，`<place>` 參數是表示一個位置，這個位置同時存在 local 跟 remote 上？","","因為你可能已經 checkout 到 `foo` branch 上，而且你不想要打亂上面的 commit，因此 git 才會特別這樣做！！這就又回到之前的 `git fetch` 的課程，它並不會放到你的 local 上的 branch (該 branch 沒有對應到任何的 remote branch)，它只會下載 commit 到 local 上且表示 remote 的 branch（所以你之後可以觀察或者 merge 它們）。",""]}},{type:"ModalAlert",options:{markdowns:['"在該例子當中，如果我特別透過 `<source>:<destination>` 來指定 source 以及 destination，會發生什麼事情？"',"","如果你很想要把 fetch 回來的 commit *直接*放到 local branch，那麼你就可以利用一個 colon refspec 來做到。你不能夠把 fetch 回來的 commit 放到你目前正 checkout 的 branch，如果不是的話，git 就會允許你這麼做。","","這裡只有一個重點，`<source>` 現在是一個在 *remote* 上的 branch，而且 `<destination>` 是一個放置這些 commit 的 *local* 的位置。它剛好就是 `git push` 的相反，而且因為我們在相反方向傳遞資料，所以這也很合理！","","其實，程式設計師很少會想要做這個，我主要是強調 `fetch` 以及 `push` 的概念是很類似的，就只是方向相反而已。"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["讓我們來實際看一下這個瘋狂的事情："],afterMarkdowns:["哇！看到了吧，git 把  `foo~1` 解讀成一個在 origin 上的位置，而且把該位置上面的 commit 下載到 `bar`（這是一個 local branch）上面，注意，因為我們有指定目的地，因此 `foo` 跟 `o/foo` 並沒有被更新。"],command:"git fetch origin foo~1:bar",beforeCommand:"git branch foo; git clone; git branch bar; git fakeTeamwork foo 2"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["如果我在執行這個指令之前，destination 不存在的話會怎樣？我們回到上一個例子，但這一次事前並沒有 `bar` 這個 branch 的存在。"],afterMarkdowns:["看到了吧，這就像是 `git push`，在 fetch 之前，git 會自己建立 destination，就好像是在 push 之前， git 會建立 remote 上的 destination 一樣（如果它不存在的話）。"],command:"git fetch origin foo~1:bar",beforeCommand:"git branch foo; git clone; git fakeTeamwork foo 2"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["沒有參數的情況？","","如果使用 `git fetch` 的時候，沒有指定任何的參數，那就相當於它會下載 remote 上面的所有的 commit，並且把這些 commit 放到 local 上面所有對應到 remote 的 branch..."],afterMarkdowns:["超簡單，但是所有的更新只做一次，很值得。"],command:"git fetch",beforeCommand:"git branch foo; git clone; git fakeTeamwork foo; git fakeTeamwork master"}},{type:"ModalAlert",options:{markdowns:["好的，講了好多！要完成這一關，fetch 視覺化的目標所指定的 commit，好好玩這些指令吧！","","對於兩個 fetch 的指令，你必須要指定 source 以及 destination，注意一下視覺化的目標，因為 commit 的 id 可以被交換！"]}}]},zh_CN:{childViews:[{type:"ModalAlert",options:{markdowns:["## Git fetch 的参数","","我们刚学习了 git push 的参数，很酷的 `<place>` 参数，还有用冒号分隔的 refspecs（`<source>:<destination>`）。 这些参数可以用于 `git fetch` 吗？","","你猜中了！`git fetch` 的参数和 `git push` 极其相似。他们的概念是相同的，只是方向相反罢了（因为现在你是下载，而非上传）","","让我们逐个讨论下这些概念……"]}},{type:"ModalAlert",options:{markdowns:["###  `<place>` 参数","","如果你像如下命令这样为 git fetch 设置 <place> 的话：","","`git fetch origin foo`","","Git 会到远程仓库的 `foo` 分支上，然后获取所有本地不存在的提交，放到本地的 `o/foo` 上。","","来看个例子（还是前面的例子，只是命令不同了）"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["通过指定 place..."],afterMarkdowns:["我们只下载了远程仓库中 `foo` 分支中的最新提交记录，并更新了 o/foo"],command:"git fetch origin foo",beforeCommand:"git branch foo; git clone; git fakeTeamwork foo 2"}},{type:"ModalAlert",options:{markdowns:["你可能会好奇 —— 为何 Git 会将新提交放到 `o/foo` 而不是放到我本地的 foo 分支呢？之前不是说这样的 <place> 参数就是同时应用于本地和远程的位置吗？","","好吧, 本例中 Git 做了一些特殊处理，因为你可能在 foo 分支上的工作还未完成，你也不想弄乱它。还记得在 `git fetch` 课程里我们讲到的吗 —— 它不会更新你的本地的非远程分支, 只是下载提交记录（这样, 你就可以对远程分支进行检查或者合并了）。",""]}},{type:"ModalAlert",options:{markdowns:["“如果我们指定 `<source>:<destination>` 会发生什么呢？”","","如果你觉得直接更新本地分支很爽，那你就用冒号分隔的 refspec 吧。不过，你不能在当前检出的分支上干这个事，但是其它分支是可以的。","","这里有一点是需要注意的 —— `source` 现在指的是远程仓库中的位置，而 `<destination>` 才是要放置提交的本地仓库的位置。它与 git push 刚好相反，这是可以讲的通的，因为我们在往相反的方向传送数据。","","理论上虽然行的通，但开发人员很少这么做。我在这里介绍它主要是为了从概念上说明 `fetch` 和 `push` 的相似性，只是方向相反罢了。"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["来看个疯狂的例子："],afterMarkdowns:["哇! 看见了吧, Git 将 `foo~1` 解析成一个 origin 仓库的位置，然后将那些提交记录下载到了本地的 `bar` 分支（一个本地分支）上。注意由于我们指定了目标分支，`foo` 和 `o/foo` 都没有被更新。"],command:"git fetch origin foo~1:bar",beforeCommand:"git branch foo; git clone; git branch bar; git fakeTeamwork foo 2"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["如果执行命令前目标分支不存在会怎样呢？我们看一下上个对话框中没有 bar 分支的情况。"],afterMarkdowns:["看见了吧，跟 git push 一样，Git 会在 fetch 前自己创建立本地分支, 就像是 Git 在 push 时，如果远程仓库中不存在目标分支，会自己在建立一样。"],command:"git fetch origin foo~1:bar",beforeCommand:"git branch foo; git clone; git fakeTeamwork foo 2"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["没有参数呢?","","如果 `git fetch` 没有参数，它会下载所有的提交记录到各个远程分支……"],afterMarkdowns:["相当简单，但是仅需更新一次，值得你去做！"],command:"git fetch",beforeCommand:"git branch foo; git clone; git fakeTeamwork foo; git fakeTeamwork master"}},{type:"ModalAlert",options:{markdowns:["好, 说得太多了！要完成本关，抓取目标窗口中指定的提交记录，使用这些魔幻的命令吧！","","使用 fetch 时, 你必须指定 source 和 destination。 注意一下目标窗口, 因为提交对象的 ID 可能会变哦!"]}}]},de_DE:{childViews:[{type:"ModalAlert",options:{markdowns:["## Git Fetch Optionen","","Nun haben wir also alles über `git push` Optionen gelernt, diesen coolen `<Ort>`-Parameter, and sogar über mit Doppelpunkt getrennte Ref-Spezifikationen (`<Quelle>:<Ziel>`). Können wir all dieses neu erworbene Wissen auch auf `git fetch` anwenden?","","Jede Wette! Die Optionen für `git fetch` sind wirklicht *sehr, sehr* ähnlich denen von `git push`. Es sind dieselben Verfahren, nur in die andere Richtung angewendet (da man bei `fetch` herunterlädt anstatt hochzuladen).","","Gehen wir die verschiedenen Verfahrensweise mal eine nach der anderen durch ..."]}},{type:"ModalAlert",options:{markdowns:["### Der Parameter `<Ort>`","",'Wenn du, wie folgt, einen "Ort" bei `git fetch` angibst:',"","`git fetch origin foo`","","wird Git zum Branch `foo` auf dem Remote gehen, dort alle Änderungen holen, die es lokal noch nicht gibt, und sie an den lokalen Branch `o/foo` anhängen.","","Schauen wir uns das mal live an (nur zur Wiederholung)"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Durch Angabe eines Ortes ..."],afterMarkdowns:["... laden wir die fehlenden Commits von `foo` und packen sie auf `o/foo` drauf."],command:"git fetch origin foo",beforeCommand:"git branch foo; git clone; git fakeTeamwork foo 2"}},{type:"ModalAlert",options:{markdowns:["Du wunderst dich vielleicht warum Git diese Commits auf den `o/foo` Branch gepacht hat, anstatt einfach direkt auf den lokalen Branch `foo`? Zeigt der Parameter `<Ort>` nicht einen Ort an, der sowohl lokal als auch entfernt existiert?","","Nun ja, Git geht diesen Schritt weil du auf `foo` ja noch Commits haben könntest, die nicht auf dem Server sind, und da will es nichts durcheinander bringen. Ähnlich wie beim früheren Level zu `git fetch` -- es aktualisiert nicht deine lokalen Arbeits-Branches, es lädt die Commits nur in die `o` (bzw. `origin`) Branches, damit du sie dir in Ruhe anschauen und integrieren kannst.",""]}},{type:"ModalAlert",options:{markdowns:["Wenn das so ist, was passiert dann wenn ich explizit Quelle und Ziel im Ort angebe?","","Wenn du Commits wirklich per `fetch` *direkt* auf einen lokalen Branch holen willst, dann kannst du das mit einer Ref-Spezifikation erreichen. Das funktioniert nicht mit deinem gerade ausgecheckten Branch, aber davon abgesehen lässt Git es zu.","","Nur ein Haken -- `<Quelle>` bezeichnet jetzt einen Ort auf dem *entfernten* Server und `<Ziel>` ist ein *lokaler* Ort, wo die Commits hin sollen. Es ist genau umgekehrt wie bei `git push` und das ist logisch, denn wir übertragen die Daten ja auch in die umgekehrte Richtung!","","Davon abgesehen benutzt man das in der Praxis kaum. Ich zeige das vor allem um zu verdeutlichen, wie `fetch` und `push` sehr ähnlich sind, nur in entgegengesetzten Richtungen."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Schauen wir uns den Quatsch mal in Aktion an:"],afterMarkdowns:["Wow! Siehst du, git löst `foo~1` als Ort auf dem Server `origin` auf und lädt dessen Commits herunter in `bar` hinein. Beachte wie `foo` und `o/foo` *nicht* aktualisiert wurden, da wir ein Ziel angegeben haben."],command:"git fetch origin foo~1:bar",beforeCommand:"git branch foo; git clone; git branch bar; git fakeTeamwork foo 2"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Was ist denn wenn das Ziel nicht existiert, für das ich den Befehl ausführe? Schauen wir uns das letzte Beispiel noch mal an, nur dass `bar` jetzt noch nicht existiert."],afterMarkdowns:["Siehst du, es ist *genau* wie `git push`. Git erstellt das Ziel lokal bevor es den `fetch` ausführt, genauso wie Git erst das Ziel auf dem Remote erstellt, befor es pusht (falls das Ziel nicht existiert)."],command:"git fetch origin foo~1:bar",beforeCommand:"git branch foo; git clone; git fakeTeamwork foo 2"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Keine Optionen?","","Wenn bei `git fetch` keine Optionen angegeben werden, lädt es einfach alle Commits vom Remote auf die lokalen Abbildungen aller Remote Branches ..."],afterMarkdowns:["Ziemlich einfach, aber man sollte es mal gesehen haben."],command:"git fetch",beforeCommand:"git branch foo; git clone; git fakeTeamwork foo; git fakeTeamwork master"}},{type:"ModalAlert",options:{markdowns:["Ok, genug gelabert! Um den Level zu schaffen musst du nur die im Zielbild angegebenen Commits per `fetch` holen. Sei kreativ mit den Befehlen!","","Du wirst Quelle und Ziel bei beiden `fetch` Befehlen angeben müssen. Schau dir das Zielbild gut an, da die IDs vertauscht sein könnten!"]}}]},ru_RU:{childViews:[{type:"ModalAlert",options:{markdowns:["## Аргументы git fetch","","Итак, мы только что изучили всё, что касается аргументов git push, мы узнали о параметре `<пункт назначения>`, и даже об аргументе, задающем отдельно источник и получатель коммитов (`<источник>:<получатель>`). Можем ли мы применить все эти полученные знания для команды `git fetch` ?","","Ещё бы! Аргументы для команды `git fetch` на самом деле *очень, очень* похожи на те, что мы использовали в `git push`. В данном случае применяется тот же подход, только в противоположном направлении (так как теперь вы скачиваете коммиты, а не закачиваете их).","","Давайте ознакомимся с принципами один за одним..."]}},{type:"ModalAlert",options:{markdowns:["### Параметр `<пункт назначения>`","","Если вы указываете пункт назначения в команде git fetch, например так, как в следующем примере:","","`git fetch origin foo`","","Git отправится в ветку `foo` на удалённом репозитории, соберёт с собой все коммиты, которые не присутствуют локально, и затем поместит их в локальную ветку под названием `o/foo`.","","Давайте взглянем на всё это в действии (чтобы освежить в памяти)."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Указывая пункт назначения..."],afterMarkdowns:["мы скачиваем только коммиты с ветки `foo` и помещаем их в `o/foo`"],command:"git fetch origin foo",beforeCommand:"git branch foo; git clone; git fakeTeamwork foo 2"}},{type:"ModalAlert",options:{markdowns:["Вы, должно быть, спрашиваете себя — зачем git поместил эти коммиты в ветку `o/foo` вместо того, чтобы разместить их в локальной ветке `foo` ? Ведь я думал о параметре `<пункт назначения>`, как о месте, ветке, которая существует в обоих - локальном и удалённом репозитории. Верно?","","На самом деле, в данном случае git делает исключение, потому что вы, возможно, работаете над веткой `foo`, которую не хотите привести в беспорядок!! Об этом упоминалось в ранних уроках по `git fetch` - эта команда не обновляет ваши локальные 'не удалённые', она лишь скачивает коммиты (соответственно, вы можете инспектировать / объединять их позже).",""]}},{type:"ModalAlert",options:{markdowns:['"Что же тогда произойдёт, если я явно укажу оба параметра: и источник и получатель, пользуясь синтаксисом `<источник>:<получатель>` ?"',"","Если вы уверены в том, что хотите закачать коммиты *прямиком* в вашу локальную ветку, тогда да, вы можете явно указать источник и получатель через двоеточние. Вы можете воспользоваться таким приёмом лишь для ветки, на которой вы не находитесь в настоящий момент `checkout`.","","Теперь у нас `<источник>` - это место на *удалённом репозитории*, а `<получатель>` - место в *локальном* репозитории, в который следует помещать коммиты. Аргументы в точности до наоборот повторяют git push, и немудрено, ведь теперь мы переносим данные в обратном направлении!","","Как уже было сказано, разработчики редко используют такой подход на практике. Целью демонстрации этой возможности было показать, насколько схожи концептуально `fetch` и `push`. Их отличие лишь в направлении переноса данных."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Давайте взглянем на всё это в действии:"],afterMarkdowns:["Ого! Видите, git распознал `foo~1` как место в origin и затем скачал эти коммиты в `bar`, которая является локальной веткой. Обратите внимание, что ветки `foo` и `o/foo` не изменились, так как в аргументах мы явно указали получателя."],command:"git fetch origin foo~1:bar",beforeCommand:"git branch foo; git clone; git branch bar; git fakeTeamwork foo 2"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["А что, если ветка-получатель не существует на момент запуска команды? Давайте ещё раз взглянем на предыдущий слайд, но на этот раз ветки `bar` ещё не существует."],afterMarkdowns:["Видите, поведение совсем такое же, как и у git push. Git создал ветку-получатель локально прежде чем скачивать данные. Всё как и в случае, когда git создаёт получателя в удалённом репозитории, когда мы закачиваем изменения (если получатель не существует)."],command:"git fetch origin foo~1:bar",beforeCommand:"git branch foo; git clone; git fakeTeamwork foo 2"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["А если вообще без аргументов ?","","Если команда `git fetch` выполняется без аргументов, она скачивает все-все коммиты с удалённого репозитория и помещает их в соответствующие удалённо-локальные ветки в локальном репозитории..."],afterMarkdowns:["Достаточно просто, после того как мы пережили все эти технические тонкости."],command:"git fetch",beforeCommand:"git branch foo; git clone; git fakeTeamwork foo; git fakeTeamwork master"}},{type:"ModalAlert",options:{markdowns:["Ладно, достаточно болтовни! Чтобы выполнить этот уровень, скачайте лишь определённые коммиты так, как представлено в визуализации цели. Пофантазируйте с этими командами!","","Вам следует явно указывать источник и получателя для обеих команд fetch. Обратите внимание на визуализацию цели, так как ID-шники могут меняться!"]}}]},ko:{childViews:[{type:"ModalAlert",options:{markdowns:["## Git fetch 인자들","","여태까지 우리는 git push 인자들에 대해 배워봤습니다. 이 멋진 `<place>` 인자 그리고 콜론 참조스펙도 말이죠(`<source>:<destination>`). 우리가 알아낸 이 지식을 `git fetch`에도 적용 할 수 있으려나요?","","당연하죠! `git fetch`에 넘기는 인자들은 사실 `git push`의 그것들과 *아주 아주* 비슷합니다. 같은 컨셉으로 적용되지만 방향이 반대일 뿐이죠(커밋을 업로드하는게 아니라 다운받는것이니까요).","","하나씩 차근차근 알아봅시다..."]}},{type:"ModalAlert",options:{markdowns:["### `<place>` 인자","","git fetch에 다음 명령어와 같이 place를 지정해주면:","","`git fetch origin foo`","","Git은 원격 저장소의 `foo` 브랜치로 가서 현재 로컬에 없는 커밋들을 가져와 로컬의 'o/foo' 브랜치 아래에 추가 할 것입니다.","","직접 확인해봅시다(상기해보죠)."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["place를 지정해주면..."],afterMarkdowns:["커밋들을 `foo`브랜치에서만 내려받은 후 로컬의 `o/foo`브랜치에만 적용합니다."],command:"git fetch origin foo",beforeCommand:"git branch foo; git clone; git fakeTeamwork foo 2"}},{type:"ModalAlert",options:{markdowns:["여러분은 분명 궁금할거에요 -- 왜 로컬의 `foo`에 그냥 커밋을 추가하지 않고 로컬의 원격 브랜치 `o/foo`에 커밋들을 추가한거지? <place> 인자는 로컬하고 원격 저장소 모두에 똑같이 있는 곳을 의미한게 아니였나?","","음, git이 이번 상황은 특별히 예외적으로 처리하기 때문입니다. 여러분이 `foo`브랜치에 작업을 했을지도 모르는데 이 명령으로 망쳐서 건드릴지도 모르니까요! 이전에 했던 강의 `git fetch`를 떠올려보면 왜 그런지 느낌이 올겁니다 -- `git fetch`는 로컬의 원격 브랜치가 아닌 브랜치는 갱신하지 않습니다, 커밋들을 내려받기만 합니다(여러분이 확인해보고 나중에 병합할 수 있도록 말이죠).",""]}},{type:"ModalAlert",options:{markdowns:['"그렇다면, 이전 강의처럼 source와 destination를 모두 직접 지정해주면 어떻게될까요? 이 명령어로 말이죠 `<source>:<destination>`"',"","여러분이 커밋을 *직접* 로컬 브랜치로 fetch할 열의가 있다면, 네 콜론 참조스펙으로 지정해서 할 수 있습니다. 하지만 체크아웃된 브랜치에 fetch할 수 는 없고 체크아웃되지 않은 브랜치만 가능합니다.","","주의 할점이 하나 있는데 -- `<source>`는 이제 받아올 커밋이 있는 *원격*에 있는 place를 넣어줘야하고 `<destination>`은 그 커밋들을 받아올 *local*의 place를 인자로 넣어줘야 합니다. git push와 정반대로 하는거죠, 데이터를 반대의 방향으로 옮기는 작업이니 이게 더 납득이 갑니다.","","언급한 것 처럼, 실제로 이것을 하는 개발자들은 많지 않습니다. 이것을 소개하는것은 `fetch`와 `push`가 방향이 반대일뿐 컨셉이 비슷하다는것을 표현하기 위해서입니다."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["자 이 해괴한 작업을 직접 확인해봅시다:"],afterMarkdowns:["이야! 보셨습니까, git이 `foo~1`을 origin의 place로 지정하고 커밋들을 내려받아 `bar`(로컬 브랜치)에 추가했습니다. `foo`와 `o/foo`는 갱신되지 않는게 확인되나요? destination을 지정해줬기 때문입니다."],command:"git fetch origin foo~1:bar",beforeCommand:"git branch foo; git clone; git branch bar; git fakeTeamwork foo 2"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["만약 destination이 될 브랜치가 없는 없는 상태에서 명령을 수행하면 어떻게 될까요? 방금의 슬라이드에서 `bar`브랜치가 없는 상태에서 수행해봅시다."],afterMarkdowns:["보이나요, git push 와 똑같습니다. Git이 fetch를 수행하기전에 destination을 로컬에 만들었습니다. git이 push를 수행하기 전에 원격저장소에 destination을 만드는것과 똑같습니다(없을경우에)."],command:"git fetch origin foo~1:bar",beforeCommand:"git branch foo; git clone; git fakeTeamwork foo 2"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["인자 없이는?","","만약 `git fetch`를 인자없이 수행하면 원격저장소에서 모든 원격 브랜치들로 커밋들을 내려받습니다..."],afterMarkdowns:["간단하지만, 짚고 넘어갑시다."],command:"git fetch",beforeCommand:"git branch foo; git clone; git fakeTeamwork foo; git fakeTeamwork master"}},{type:"ModalAlert",options:{markdowns:["좋습니다, 설명은 이정도로 하고! 이번 레벨을 끝내기위해서는 시각화된 골처럼 커밋들을 fetch하면 됩니다. 명령어로 멋지게 해내봅시다!","","fetch 명령에 source와 destination을 모두 지정해줘야 할겁니다. 골 시각화를 잘 보세요 fetch를 하다보면 커밋들의 ID가 바뀔수도있어요!"]}}]},uk:{childViews:[{type:"ModalAlert",options:{markdowns:["## Аргументи git fetch","","Отже, ми вже вивчили все про аргументи git push, про корисний параметр `<place>` і про формат запису з двокрапкою (`<source>:<destination>`). Чи знадобляться нам ці зання при вивченні `git fetch`?","","Ще б пак! Аргументи для `git fetch` насправді *дуже, дуже* схожі на `git push`. Принцип той самий, з точністю до напрямку (бо ми звантважуємо коміти, а не завантажуємо).","","Розгляньмо це крок за кроком..."]}},{type:"ModalAlert",options:{markdowns:["### Параметр `<place>`","","Якщо вказати параметр `<place>` для команди git fetch, наприклад, так:","","`git fetch origin foo`","","git піде у віддалену гілку `foo`, візьме всі коміти, яких немає локально і закине в локальну гілку `o/foo`.","","Подивімось на це в дії (просто щоб пригадати)."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Вказуючи `<place>`..."],afterMarkdowns:["Ми звантажуємо коміти лише з `foo` і кладемо їх в `o/foo`"],command:"git fetch origin foo",beforeCommand:"git branch foo; git clone; git fakeTeamwork foo 2"}},{type:"ModalAlert",options:{markdowns:["Ти можеш спитати, чому git закинув ці коміти в гілку `o/foo` замість того, щоб покласти їх відразу в локальну гілку `foo`? Я думав, що параметр `<place>` одночасно вказує місце звідки взяти і куди поставити?","","Ну, git робить невеликий виняток в цьому випадку, оскільки ти, ймовірно, маєш якусь роботу в `foo`, і не хочеш там нічого зіпсувати! Пригадай з попереднього уроку про `git fetch` -- він не оновлює твої локальні (не віддалені -- без `o/`) гілки, він тільки звантажує коміти (так, щоб їх можна було переглянути/змерджити пізніше).",""]}},{type:"ModalAlert",options:{markdowns:['"Ну, в такому разі, що буде, якщо явно вказати і джерело і призначення `<source>:<destination>`?"',"","Якщо ти почуваєшся достатньо впевненим і хочеш звантажити віддалені коміти *прямо* в свою локальну гілку, тоді -- справді, ти можеш так написати, використавши синтаксис з двокрапкою. Єдиний виняток -- таким способом не можна витягувати зміни в поточну локальну гілку, в будь-яку іншу -- без проблем.","","Тепер в нас `<source>` вказує на *віддалений репозиторій*, а `<destination>` -- на *локальне* місце, куди звантажаться коміти. Це повна протилежність тому, як було в git push, що, зрештою, має сенс, адже ми передаємо дані у протилежному напрямку!","","Насправді, розробники рідко використовують такий спосіб на практиці. І він показаний тут лише для повноти описання наскільки `fetch` і `push` схожі, відрізняючись лише напрямом дії."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Подивімось на це божевілля в дії:"],afterMarkdowns:["Ого! Дивись, git прийняв `foo~1` за джерело, і звантажив коміти в `bar` (локальна гілка). Зауваж, що `foo` і `o/foo` не оновлювались, оскільки ми явно вказали звідки і куди передавати коміти."],command:"git fetch origin foo~1:bar",beforeCommand:"git branch foo; git clone; git branch bar; git fakeTeamwork foo 2"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["А якщо вказаного місця призначення не існує на момент виконання команди? Погляньмо на попередній слайд, але без гілки `bar`."],afterMarkdowns:["Бачиш, все як і в випадку з git push. Git створив локальну гілку-призначення перед звантаженням, так само як створить гілку-призначення на віддаленій стороні перед пушем (якщо її не існувало, звичайно)."],command:"git fetch origin foo~1:bar",beforeCommand:"git branch foo; git clone; git fakeTeamwork foo 2"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Без аргументів?","","Якщо `git fetch` запущено без аргументів, він просто звантажить всі коміти з віддаленого репозиторія в віддалені (`o/`) гілки..."],afterMarkdowns:["Все дуже просто, але варто було згадати ще раз."],command:"git fetch",beforeCommand:"git branch foo; git clone; git fakeTeamwork foo; git fakeTeamwork master"}},{type:"ModalAlert",options:{markdowns:["Гаразд, годі балакати! Щоб пройти цей рівень, звантаж лише вказані на візуалізації коміти. Прояви фантазію, підбираючи команди!","","Тобі потрібно вказати і джерело і призначення для обидвох fetch-команд. Слідкуй за змінами на візуалізації, ID комітів можуть змінюватися!"]}}]},vi:{childViews:[{type:"ModalAlert",options:{markdowns:["## Tham số Git fetch","","Chúng ta vừa tìm hiểu về tham số của git push, sự tuyệt vời của tham số `<vị trí>`, và thậm chí cả refspecs (`<nguồn>:<đích>`). Liệu ta có thể áp dụng điều này vào `git fetch` không nhỉ?","","Đoán chuẩn rồi đấy! Tham số cho lệnh `git fetch` thực ra *rất, rất* giống với `git push`. Chúng có chung khái niệm nhưng được áp dụng cho hướng ngược lại(vì bây giờ ta tải xuống commit chứ không phải tải lên).","","Hãy lần lượt đi qua từng khái niệm một..."]}},{type:"ModalAlert",options:{markdowns:["### Tham số `<vị trí>`","","Nếu bạn chỉ định vị trí cho `git fetch` như câu lệnh dưới:","","`git fetch origin foo`","","Git sẽ lênh nhánh `foo` trên kho chứa từ xa, lấy toàn bộ các commit chưa có trên kho chứa cục bộ và thả chúng xuống nhánh `o/foo` ở kho chứa cục bộ.","","Hãy xem một ví dụ (vẫn là câu lệnh trên nhưng mà trực quan hơn)."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Thông qua chỉ định vị trí..."],afterMarkdowns:["Ta chỉ tải xuống commit ở trên nhánh `foo` và đặt chúng ở nhánh `o/foo`"],command:"git fetch origin foo",beforeCommand:"git branch foo; git clone; git fakeTeamwork foo 2"}},{type:"ModalAlert",options:{markdowns:["Có thể bạn sẽ thắc mắc -- tại sao git lại thả các commit xuống nhánh `o/foo` thay vì nhánh `foo` ở kho chứa cục bộ? Tôi tưởng tham số `<vị trí>` tồn tại ở cả kho chứa cục bộ và kho chứa từ xa mà?","","Chà trong trường hợp này git ứng xử có một chút ngoại lệ đặc biệt, vì có thể bạn đang làm việc trên nhánh `foo` ở kho chứa cục bộ mà bạn không muốn nó bị làm rối!! Điều này liên kết đến bài học trước về `git fetch` -- nó không cập nhật nhánh cục bộ không liên kết nhánh từ xa của bạn(nhánh không có tiền tố `origin/`), nó chỉ tải xuống các commit( mà bạn có thể xem xét hoặc hợp nhất sau).",""]}},{type:"ModalAlert",options:{markdowns:['"Nếu vậy, thì điều gì sẽ xảy ra nếu tôi chỉ định cả nguồn và đích với `<nguồn>:<đích>`?"',"","Nếu bạn nhất quyết muốn tải commit *trực tiếp* xuống nhánh cục bộ,thì bạn có thể chỉ định điều này bằng cách dùng refspec hai chấm. Bạn không thể nạp commit vào nhánh mà bạn đang đứng, nhưng git sẽ cho phép bạn làm điều này:","","Đây là cách duy nhất -- `<nguồn>` là vị trí trên kho *từ xa* và `<đích>` là vị trí *cục bộ* để đặt các commit. Điều này hoàn toàn ngược lại với `git push`, và đó là tất nhiên thôi vì ta đang chuyển giao dữ liệu theo hướng ngược lại!","","Thực tế là, các nhà phát triển rất hiếm khi làm điều này. Tôi giới thiệu về nó chủ yếu là vì muốn giải thích rõ hơn việc `fetch` và `push` là khá tương đồng, chỉ là theo hướng ngược lại."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Lấy một ví dụ điên rồ..."],afterMarkdowns:["Wao! Thấy chứ, git diễn giải `foo~1` thành một vị trí trên kho chứa từ xa sau đó tải xuống các commit lên nhánh `bar` ở kho chứa cục bộ. Để ý rằng nhánh `foo` và `o/foo` không hề được cập nhật vì ta đã chỉ định đích đến."],command:"git fetch origin foo~1:bar",beforeCommand:"git branch foo; git clone; git branch bar; git fakeTeamwork foo 2"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Nếu như đích đến chưa hề tồn tại trước khi tôi chạy lệnh thì sao? Cùng xem lại ví dụ vừa rồi nhưng lần này nhánh `bar` chưa hề tồn tại."],afterMarkdowns:["Thấy chứ, nó Y HỆT với git push. Git tạo ra đích đến ở kho chứa cục bộ trước khi nạp, cũng giống như git sẽ tạo ra đích đến trên kho chứa từ xa trước khi đẩy (trong trường hợp nó không tồn tại)."],command:"git fetch origin foo~1:bar",beforeCommand:"git branch foo; git clone; git fakeTeamwork foo 2"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Không có tham số?","","Nếu lệnh `git fetch` không nhận được bất kỳ tham số nào, nó sẽ tải xuống tất cả các commit có trên kho chứa từ xa lên tất cả các nhánh từ xa ở kho chứa cục bộ..."],afterMarkdowns:["Khá là đơn giản, nhưng mà cũng nên xem qua thử."],command:"git fetch",beforeCommand:"git branch foo; git clone; git fakeTeamwork foo; git fakeTeamwork master"}},{type:"ModalAlert",options:{markdowns:["Được rồi, lý thuyết như vậy là đủ rồi! Để hoàn thành cấp độ này, hãy chỉ nạp những commit được chỉ định trong mô tả mục tiêu. Thoải mái ứng biến với những câu lệnh nhé!","","Bạn sẽ phải chỉ định nguồn và dích cho lệnh fetch. Chú ý đến mô tả mục tiêu vì các ID có thể bị xáo trộn!"]}}]}}}},{}],135:[function(e,t,o){o.level={goalTreeString:"%7B%22branches%22%3A%7B%22master%22%3A%7B%22target%22%3A%22C3%27%22%2C%22id%22%3A%22master%22%2C%22remoteTrackingBranchID%22%3A%22o/master%22%2C%22localBranchesThatTrackThis%22%3Anull%7D%2C%22o/master%22%3A%7B%22target%22%3A%22C3%27%22%2C%22id%22%3A%22o/master%22%2C%22remoteTrackingBranchID%22%3Anull%2C%22localBranchesThatTrackThis%22%3A%5B%22master%22%5D%7D%7D%2C%22commits%22%3A%7B%22C0%22%3A%7B%22parents%22%3A%5B%5D%2C%22id%22%3A%22C0%22%2C%22rootCommit%22%3Atrue%7D%2C%22C1%22%3A%7B%22parents%22%3A%5B%22C0%22%5D%2C%22id%22%3A%22C1%22%7D%2C%22C3%22%3A%7B%22parents%22%3A%5B%22C1%22%5D%2C%22id%22%3A%22C3%22%7D%2C%22C2%22%3A%7B%22parents%22%3A%5B%22C1%22%5D%2C%22id%22%3A%22C2%22%7D%2C%22C3%27%22%3A%7B%22parents%22%3A%5B%22C2%22%5D%2C%22id%22%3A%22C3%27%22%7D%7D%2C%22HEAD%22%3A%7B%22target%22%3A%22master%22%2C%22id%22%3A%22HEAD%22%7D%2C%22originTree%22%3A%7B%22branches%22%3A%7B%22master%22%3A%7B%22target%22%3A%22C3%27%22%2C%22id%22%3A%22master%22%2C%22remoteTrackingBranchID%22%3Anull%2C%22localBranchesThatTrackThis%22%3Anull%7D%7D%2C%22commits%22%3A%7B%22C0%22%3A%7B%22parents%22%3A%5B%5D%2C%22id%22%3A%22C0%22%2C%22rootCommit%22%3Atrue%7D%2C%22C1%22%3A%7B%22parents%22%3A%5B%22C0%22%5D%2C%22id%22%3A%22C1%22%7D%2C%22C2%22%3A%7B%22parents%22%3A%5B%22C1%22%5D%2C%22id%22%3A%22C2%22%7D%2C%22C3%27%22%3A%7B%22parents%22%3A%5B%22C2%22%5D%2C%22id%22%3A%22C3%27%22%7D%7D%2C%22HEAD%22%3A%7B%22target%22%3A%22master%22%2C%22id%22%3A%22HEAD%22%7D%7D%7D",solutionCommand:"git clone;git fakeTeamwork;git commit;git pull --rebase;git push",startTree:'{"branches":{"master":{"target":"C1","id":"master","remoteTrackingBranchID":null,"localBranchesThatTrackThis":null}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"}},"HEAD":{"target":"master","id":"HEAD"}}',name:{en_US:"Diverged History",zh_CN:"偏离的提交历史",zh_TW:"diverged history",es_AR:"Historia divergente",es_ES:"Historia divergente",pt_BR:"Histórico divergente",gl:"Histórico diverxente",de_DE:"Abweichende History",fr_FR:"Historique divergent",ja:"履歴の分岐",ru_RU:"Расхождение в истории",uk:"Розбіжності в історії",ko:"엇갈린 히스토리",vi:"Dị biệt lịch sử"},hint:{en_US:"check out the ordering from the goal visualization",zh_CN:"按照目标中的提交树的顺序进行检出",zh_TW:"確認視覺化的目標中的順序",es_AR:"Prestá atención al orden del objetivo",es_ES:"Presta atención al orden del objetivo",pt_BR:"Preste atenção na ordem da visualização do objetivo",gl:"Presta atención ó orixe do obxectivo",de_DE:"Beachte die Reihenfolge in der Zieldarstellung",ja:"ゴールのツリーの順番を参考にすること",fr_FR:"regardez l'ordre dans la fenêtre de visualisation d'objectif",ru_RU:"проверьте сортировку в визуализации цели",uk:"перевірте порядок в візуалізації цілі",ko:"순서는 goal을 참고하세요",vi:"kiểm tra kỹ thứ tự trên mô hình mục tiêu"},startDialog:{en_US:{childViews:[{type:"ModalAlert",options:{markdowns:["## Diverged Work","","So far we've seen how to `pull` down commits from others and how to `push` up our own changes. It seems pretty simple, so how can people get so confused?","","The difficulty comes in when the history of the repository *diverges*. Before discussing the details of this, let's see an example...",""]}},{type:"ModalAlert",options:{markdowns:["Imagine you clone a repository on Monday and start dabbling on a side feature. By Friday you are ready to publish your feature -- but oh no! Your coworkers have written a bunch of code during the week that's made your feature out of date (and obsolete). They've also published these commits to the shared remote repository, so now *your* work is based on an *old* version of the project that's no longer relevant.","","In this case, the command `git push` is ambiguous. If you run `git push`, should git change the remote repository back to what it was on Monday? Should it try to add your code in while not removing the new code? Or should it totally ignore your changes since they are totally out of date?","","Because there is so much ambiguity in this situation (where history has diverged), git doesn't allow you to `push` your changes. It actually forces you to incorporate the latest state of the remote before being able to share your work."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["So much talking! Let's see this situation in action"],afterMarkdowns:["See? Nothing happened because the command fails. `git push` fails because your most recent commit `C3` is based off of the remote at `C1`. The remote has since been updated to `C2` though, so git rejects your push"],command:"git push",beforeCommand:"git clone; git fakeTeamwork; git commit"}},{type:"ModalAlert",options:{markdowns:["How do you resolve this situation? It's easy, all you need to do is base your work off of the most recent version of the remote branch.","","There are a few ways to do this, but the most straightforward is to move your work via rebasing. Let's go ahead and see what that looks like."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Now if we rebase before pushing instead..."],afterMarkdowns:["Boom! We updated our local representation of the remote with `git fetch`, rebased our work to reflect the new changes in the remote, and then pushed them with `git push`"],command:"git fetch; git rebase o/master; git push",beforeCommand:"git clone; git fakeTeamwork; git commit"}},{type:"ModalAlert",options:{markdowns:["Are there other ways to update my work when the remote repository has been updated? Of course! Let's check out the same thing but with `merge` instead.","","Although `git merge` doesn't move your work (and instead just creates a merge commit), it's a way to tell git that you have incorporated all the changes from the remote. This is because the remote branch is now an *ancestor* of your own branch, meaning your commit reflects all commits in the remote branch.","","Lets see this demonstrated..."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Now if we merge instead of rebasing..."],afterMarkdowns:["Boom! We updated our local representation of the remote with `git fetch`, *merged* the new work into our work (to reflect the new changes in the remote), and then pushed them with `git push`"],command:"git fetch; git merge o/master; git push",beforeCommand:"git clone; git fakeTeamwork; git commit"}},{type:"ModalAlert",options:{markdowns:["Awesome! Is there any way I can do this without typing so many commands?","","Of course -- you already know `git pull` is just shorthand for a fetch and a merge. Conveniently enough, `git pull --rebase` is shorthand for a fetch and a rebase!","","Let's see these shorthand commands at work."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["First with `--rebase`..."],afterMarkdowns:["Same as before! Just a lot shorter."],command:"git pull --rebase; git push",beforeCommand:"git clone; git fakeTeamwork; git commit"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["And now with regular `pull`"],afterMarkdowns:["Again, exact same as before!"],command:"git pull; git push",beforeCommand:"git clone; git fakeTeamwork; git commit"}},{type:"ModalAlert",options:{markdowns:["This workflow of fetching, rebase/merging, and pushing is quite common. In future lessons we will examine more complicated versions of these workflows, but for now let's try this out.","","In order to solve this level, take the following steps:","","* Clone your repo","* Fake some teamwork (1 commit)","* Commit some work yourself (1 commit)","* Publish your work via *rebasing*"]}}]},fr_FR:{childViews:[{type:"ModalAlert",options:{markdowns:["## Travail divergent","","Jusqu'à présent nous avons vu comment rapatrier (`pull`) les commits de nos collaborateurs et comment envoyer les nôtres (`push`). Cela a l'air simple, alors comment certains peuvent trouver le sujet aussi confus ?","","La difficulté arrive quand l'historique du dépôt *diverge*. Avant d'aborder les détails de cette situation, voyons un exemple ...",""]}},{type:"ModalAlert",options:{markdowns:["Imaginez que vous clonez un dépôt le lundi et commencez à bidouiller une nouvelle fonctionnalité. Le vendredi vous êtes prêt à publier votre fonctionnalité -- mais oh non ! Vos collègues ont écrit une floppée de code durant la semaine, ce qui rend votre fonctionnalité désuète (et obsolète). Ils ont aussi publié sur le dépôt distant partagé, donc maintenant *votre* travail est basé sur une *vieille* version du projet qui n'est plus viable.","","Dans ce cas, la commande `git push` est ambiguë. Si vous exécutez `git push`, git devrait-il remettre le dépôt distant tel qu'il était lundi ? Doit-il essayer d'ajouter votre code sans supprimer le nouveau code ? Ou doit-il totalement ignorer vos changements puisqu'ils ne sont plus à jour ?","","Comme il y a trop d'ambiguïté dans cette situation (où l'historique a divergé), git ne vous autorise pas à faire un `push` de vos changements. Cela vous force en fait à rapatrier chez vous le dernier état du dépôt distant avant de pouvoir partager votre travail."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Assez parlé ! Observons cette situation en action :"],afterMarkdowns:["Vous voyez ? Rien ne s'est produit car la commande a échoué. `git push` a échoué car votre plus récent commit `C3` est basé sur le dépôt distant sur `C1`. Le dépôt distant a depuis été mis à jour avec `C2`, donc git rejette votre push."],command:"git push",beforeCommand:"git clone; git fakeTeamwork; git commit"}},{type:"ModalAlert",options:{markdowns:["Comment allez-vous résoudre cette situation ? C'est facile, tout ce que vous avez à faire est de baser votre travail sur la dernière version de la branche distante.","","Il y a plusieurs façons de faire cela, mais la plus directe est de déplacer votre travail avec rebase. Regardons à quoi cela ressemble."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Maintenant si nous rebasons avant de push..."],afterMarkdowns:["Boum ! Nous avons mis à jour notre représentation locale du dépôt avec `git fetch`, rebasé notre travail pour refléter les nouveaux changements, et enfin les avons envoyés avec `git push`."],command:"git fetch; git rebase o/master; git push",beforeCommand:"git clone; git fakeTeamwork; git commit"}},{type:"ModalAlert",options:{markdowns:["Existe-t-il d'autres façons de mettre à jour notre travail quand le répertoire distant a été mis à jour ? Bien sûr ! Faisons la même chose, mais cette fois avec `merge`.","","Bien que `git merge` ne déplace pas votre travail (et crée à la place un commit de fusion), cette commande est également une façon de dire à git que vous avez incorporé tous les changements du dépôt distant. En effet la branche distante est maintenant une *ancêtre* de votre propre branche, ce qui signifie que vos commits contiennent tous les changements faits sur la branche distante.","","Voyons une démonstration ..."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Maintenant si nous mergeons au lieu de rebaser ..."],afterMarkdowns:["Boum ! Nous avons mis à jour notre représentation locale du dépôt distant avec `git fetch`, *fusionné* les nouveaux commits dans notre copie de travail (pour refléter les nouveaux changements du dépôt distant), et les avons ensuite envoyés avec `git push`."],command:"git fetch; git merge o/master; git push",beforeCommand:"git clone; git fakeTeamwork; git commit"}},{type:"ModalAlert",options:{markdowns:["Impressionnant ! Existe-t-il une façon de faire tout cela sans taper autant de commandes ?","","Bien sûr : vous savez déjà que `git pull` est simplement un raccourci pour un fetch puis un merge. De manière assez pratique, `git pull --rebase` est un raccourci pour un fetch puis un rebase !","","Voyons ce raccourci au travail."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Premièrement avec  `--rebase`..."],afterMarkdowns:["Comme avant ! Juste un peu plus court."],command:"git pull --rebase; git push",beforeCommand:"git clone; git fakeTeamwork; git commit"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Et maintenant avec un `pull` normal :"],afterMarkdowns:["A nouveau, c'est exactement la même chose qu'auparavant !"],command:"git pull; git push",beforeCommand:"git clone; git fakeTeamwork; git commit"}},{type:"ModalAlert",options:{markdowns:["Cette succession de fetch, rebase/merge, et push est assez commune. Dans les leçons suivantes, nous explorerons cette façon d'enchaîner les commandes dans des conditions plus complexes, mais pour le moment appliquons ce principe de façon classique.","","Pour finir ce niveau, réalisez les étapes suivantes :","","* Clonez votre dépôt","* Simulez un travail d'équipe (1 commit)","* Commitez un peu de votre travail (1 commit)","* Publiez votre travail avec *rebase*"]}}]},es_AR:{childViews:[{type:"ModalAlert",options:{markdowns:["## Trabajo divergente","","Hasta acá vimos cómo pullear commits de otros y cómo pushear los nuestros. Parece bastante simple, así que ¿cómo puede confundirse tanto la gente?","","La dificultad viene cuando la historia de los repositorios *diverge*. Antes de entrar en detalles, veamos un ejemplo...",""]}},{type:"ModalAlert",options:{markdowns:["Imaginate que clonás un repositorio el lunes y empezás a desarrollar algo. Para el viernes ya estás listo para publicar tu trabajo, pero, ¡oh, oh! Tus colegas también escribieron código durante la semana, haciendo que tu trabajo quede desactualizado (y obsoleto). Además, ellos publicaron esos commits en el repositorio remoto, así que ahora *tu* trabajo está basado en una versión *vieja* del proyecto, que ya no le interesa a nadie.","","En este caso, el comando `git push` es ambiguo. Si corrés `git push`, ¿git debería cambiar el repositorio a como estaba el lunes? ¿Debería tratar de agregar tu código sin eliminar el código nuevo? ¿O debería ignorar completamente tus cambios porque están desactualizados?","","Como hay tanta ambiguedad en esta situación (en que la historia divirgió), git no te permite pushear tus cambios. En cambio, te fuerza a integrar el último estado del repositorio remoto antes de poder compartir tu trabajo."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["¡Demasiada charla, veámoslo en acción!"],afterMarkdowns:["¿Ves? No pasó nada, porque el comando falla. `git push` falla porque `C3`, tu commit más reciente, está basado en el remoto sobre `C1`. El remoto fue actualizado a `C2` desde entonces, por lo que git rechaza tu push"],command:"git push",beforeCommand:"git clone; git fakeTeamwork; git commit"}},{type:"ModalAlert",options:{markdowns:["¿Cómo resolvés esta situación? Es fácil, todo lo que tenés que hacer es basar tu trabajo en la versión más reciente de la rama remota.","","Hay un par de maneras de hacer esto, pero la más simple es mover tu trabajo haciendo un rebase. Probémoslo a ver cómo se ve."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Ahora, si mejor rebaseamos antes de pushear..."],afterMarkdowns:["¡Boom! Actualizamos nuestra representación local del remoto con `git fetch`, rebaseamos nuestro trabajo para reflejar los nuevos cambios del remoto, y después los pusheamos con `git push`"],command:"git fetch; git rebase o/master; git push",beforeCommand:"git clone; git fakeTeamwork; git commit"}},{type:"ModalAlert",options:{markdowns:["¿Hay otra manera de actualizar mi trabajo si actualizaron el repositorio remoto? ¡Claro que sí! Veamos cómo hacer lo mismo pero usando `merge`.","","Por más que `git merge` no mueva tu trabajo (sólo crea un commit de merge), es un modo de decirle a git que integraste todos los cambios del remoto. Esto es porque ahora una rama remota pasó a ser un *ancestro* de tu propia rama, lo que significa que tu commit refleja los cambios de todos los commits de la rama remota.","","Veamos una muestra..."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Si en lugar de rebasear hacemos un merge..."],afterMarkdowns:["¡Boom! Actualizamos nuestra representación local del remoto usando `git fetch`, *mergeamos* el nuevo trabajo junto con el nuestro (para reflejar los nuevos cambios en el remoto), y después los pusheamos usando `git push`"],command:"git fetch; git merge o/master; git push",beforeCommand:"git clone; git fakeTeamwork; git commit"}},{type:"ModalAlert",options:{markdowns:["¡Asombroso! ¿Hay forma de hacer esto sin tipear tantos comandos?","","¡Claro que sí! Ya sabés que `git pull` es simplemente un atajo para hacer fetch y merge. Convenientemente, ¡`git pull --rebase` es un atajo para hacer fetch y rebase!","","Veamos estos atajos funcionando."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Primero con `--rebase`..."],afterMarkdowns:["¡Igual que antes! Sólo que bastante más corto."],command:"git pull --rebase; git push",beforeCommand:"git clone; git fakeTeamwork; git commit"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Y ahora un `pull` común"],afterMarkdowns:["Otra vez, ¡exactamente lo mismo que antes!"],command:"git pull; git push",beforeCommand:"git clone; git fakeTeamwork; git commit"}},{type:"ModalAlert",options:{markdowns:["Toda esta movida de fetchear, rebasear/mergear y pushear es bastante común. En lecciones futuras vamos a ver formas más complejas de estos flujos de trabajo, pero por ahora probemos esto que vimos.","","Para resolver este nivel, hacé lo siguiente:","","* Cloná tu repositorio","* Simulá algo de trabajo de un colega (1 commit)","* Commiteá algo de trabajo propio (1 commit)","* Publicá tu trabajo *rebaseando*"]}}]},es_ES:{childViews:[{type:"ModalAlert",options:{markdowns:["## Trabajo divergente","","Hasta ahora hemos visto cómo hacer pull a commits de otros y cómo hacer push a los nuestros. Parece bastante simple, así que ¿cómo puede confundirse tanto la gente?","","La dificultad viene cuando la historia de los repositorios *diverge*. Antes de entrar en detalles, veamos un ejemplo...",""]}},{type:"ModalAlert",options:{markdowns:["Imagínate que clonas un repositorio el lunes y empiezas a desarrollar algo. Para el viernes ya estás listo para publicar tu trabajo, pero, ¡vaya! Tus colegas también han estado escribiendo código durante la semana, haciendo que tu trabajo quede desactualizado (y obsoleto). Además, ellos publicaron esos commits en el repositorio remoto, así que ahora *tu* trabajo está basado en una versión *vieja* del proyecto, que ya no le interesa a nadie.","","En este caso, el comando `git push` es ambiguo. Si ejecutas `git push`, ¿git debería cambiar el repositorio a como estaba el lunes? ¿Debería tratar de agregar tu código sin eliminar el código nuevo? ¿O debería ignorar completamente tus cambios porque están desactualizados?","","Como hay tanta ambiguedad en esta situación (en la que la historia divirgió), git no te permite hacer push de tus cambios. En cambio, te fuerza a integrar el último estado del repositorio remoto antes de poder compartir tu trabajo."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["¡Demasiada charla, veámoslo en acción!"],afterMarkdowns:["¿Ves? No pasó nada, porque el comando falla. `git push` falla porque `C3`, tu commit más reciente, está basado en el remoto sobre `C1`. El remoto fue actualizado a `C2` desde entonces, por lo que git rechaza tu push"],command:"git push",beforeCommand:"git clone; git fakeTeamwork; git commit"}},{type:"ModalAlert",options:{markdowns:["¿Cómo puedes resolver esta situación? Es fácil, todo lo que tienes que hacer es basar tu trabajo en la versión más reciente de la rama remota.","","Hay un par de maneras de hacer esto, pero la más simple es mover tu trabajo haciendo un rebase. Probémoslo a ver cómo se ve."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Ahora, si hacemos rebase antes de hacer push..."],afterMarkdowns:["¡Zas! Actualizamos nuestra representación local del remoto con `git fetch`, hacemos rebase de nuestro trabajo para reflejar los nuevos cambios del remoto, y después los subimos con `git push`"],command:"git fetch; git rebase o/master; git push",beforeCommand:"git clone; git fakeTeamwork; git commit"}},{type:"ModalAlert",options:{markdowns:["¿Hay otra manera de actualizar mi trabajo si actualizaron el repositorio remoto? ¡Claro que sí! Veamos cómo hacer lo mismo pero usando `merge`.","","Por más que `git merge` no mueva tu trabajo (sólo crea un commit de merge), es un modo de decirle a git que integraste todos los cambios del remoto. Esto es porque ahora una rama remota pasó a ser un *ancestro* de tu propia rama, lo que significa que tu commit refleja los cambios de todos los commits de la rama remota.","","Veamos una muestra..."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Si en lugar de hacer rebase hacemos un merge..."],afterMarkdowns:["¡Zas! Actualizamos nuestra representación local del remoto usando `git fetch`, *mergeamos* el nuevo trabajo junto con el nuestro (para reflejar los nuevos cambios en el remoto), y después los subimos usando `git push`"],command:"git fetch; git merge o/master; git push",beforeCommand:"git clone; git fakeTeamwork; git commit"}},{type:"ModalAlert",options:{markdowns:["¡Asombroso! ¿Hay forma de hacer esto sin escribir tantos comandos?","","¡Claro que sí! Ya sabes que `git pull` es simplemente un atajo para hacer fetch y merge. Convenientemente, ¡`git pull --rebase` es un atajo para hacer fetch y rebase!","","Veamos estos atajos funcionando."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Primero con `--rebase`..."],afterMarkdowns:["¡Igual que antes! Sólo que bastante más corto."],command:"git pull --rebase; git push",beforeCommand:"git clone; git fakeTeamwork; git commit"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Y ahora un `pull` común"],afterMarkdowns:["Otra vez, ¡exactamente lo mismo que antes!"],command:"git pull; git push",beforeCommand:"git clone; git fakeTeamwork; git commit"}},{type:"ModalAlert",options:{markdowns:["Toda este tinglado de hacer fetch, rebase/merge y push es bastante común. En lecciones futuras vamos a ver formas más complejas de estos flujos de trabajo, pero por ahora vamos a probar esto que acabamos de ver.","","Para resolver este nivel, haz lo siguiente:","","* Clona tu repositorio","* Simula algo de trabajo de un colega (1 commit)","* Haz commit de algún cambio tuyo (1 commit)","* Publica tu trabajo *rebaseando*"]}}]},pt_BR:{childViews:[{type:"ModalAlert",options:{markdowns:["## Histórico Divergente","","Até o momento vimos como fazer `pull` de commits dos outros e como fazer `push` de nossas próprias mudanças. Parece ser tão simples, como será que as pessoas ficam tão confusas?","","A dificuldade aparece quando o histórico do repositório *diverge*. Antes de discutir os detalhes disso, vejamos um exemplo...",""]}},{type:"ModalAlert",options:{markdowns:["Imagine que você clonou um repositório na segunda-feira e começou a trabalhar em uma funcionalidade nova. Na sexta-feira você está pronto para publicar a funcionalidade -- mas, ah não! Seus colegas escreveram um bocado de código durante a semana, tornando a sua funcionalidade obsoleta. Eles também publicaram esses commits no repositório remoto que vocês compartilham, então agora o *seu* trabalho é baseado em uma versão *antiga* do projeto, que não é mais relevante.","","Neste caso, o comando `git push` é ambíguo. Se você executar `git push`, será que o Git deveria tratar o repositório remoto como se ele ainda estivesse no estado da segunda-feira? Será que ele deveria tentar adicionar seu código dentro do repositório sem tentar remover o código novo? Ou será que ele deveria simplesmente ignorar suas mudanças totalmente, já que elas estão obsoletas?","","Devido à grande ambiguidade que surge neste tipo de situação (quando a história divergiu), o Git não permite que você faça `push` das suas mudanças. Ele, de fato, força você a incorporar o último estado do repositório remoto antes de conseguir compartilhar o seu trabalho."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Chega de conversa! Vejamos essa situação na prática"],afterMarkdowns:["Viu? Nada aconteceu porque o comando falhou. O `git push` falha porque o commit mais recente (`C3`) é baseado no remoto em `C1`. Como o remoto foi atualizado no meio tempo, o Git rejeita o push"],command:"git push",beforeCommand:"git clone; git fakeTeamwork; git commit"}},{type:"ModalAlert",options:{markdowns:["Como resolver essa situação? É fácil, tudo que você precisa fazer é basear seu trabalho na versão mais recente do ramo remoto.","","Existem algumas maneiras de fazer isso, mas a mais direta é mover o seu trabalho usando rebase. Vamos em frente, ver como isso é feito."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Agora se nós fizermos um rebase antes do push..."],afterMarkdowns:["Boom! Nós atualizamos a representação local do repositório remoto com `git fetch`, fizemos rebase do nosso trabalho para refletir as novas mudanças no repositório remoto, e então enviamos nossas mudanças com `git push`"],command:"git fetch; git rebase o/master; git push",beforeCommand:"git clone; git fakeTeamwork; git commit"}},{type:"ModalAlert",options:{markdowns:["Será que existem outras formas de compartilhar meu trabalho quando o repositório remoto tiver sido atualizado? Claro! Vamos fazer a mesma tarefa usando `merge` em vez de `rebase`.","","Embora o `git merge` não mova o seu trabalho (em vez disso, ele cria um commit de merge), ele é uma forma de contar ao Git que você incorporou todas as mudanças do repositório remoto. Isso acontece porque o ramo remoto passa a ser um *ancestral* do seu próprio ramo, significando que o seu commit reflete todos os commits contidos no ramo remoto.","","Vejamos uma demonstração..."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Agora se fizermos merge em vez de rebase ..."],afterMarkdowns:["Boom! Atualizamos nossa representação local do repositório remoto com `git fetch`, fizemos *merge* do novo trabalho com o nosso (para refletir as novas mudanças no repositório remoto), e então fizemos push deles com `git push`"],command:"git fetch; git merge o/master; git push",beforeCommand:"git clone; git fakeTeamwork; git commit"}},{type:"ModalAlert",options:{markdowns:["Incrível! Existe alguma forma de fazer isso sem digitar tantos comandos?","","É claro -- você já conhece o `git pull` e ele é simplesmente um atalho para um fetch e um merge. Convenientemente, entretanto, o comando `git pull --rebase` é uma abreviação para um fetch e um rebase!","","Vejamos esses dois comandos em ação."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Primeiro com `--rebase`..."],afterMarkdowns:["Mesma coisa que antes! Porém muito mais curto."],command:"git pull --rebase; git push",beforeCommand:"git clone; git fakeTeamwork; git commit"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["E agora com o `pull` normal"],afterMarkdowns:["De novo, exatamente como antes!"],command:"git pull; git push",beforeCommand:"git clone; git fakeTeamwork; git commit"}},{type:"ModalAlert",options:{markdowns:["Esse fluxo de trabalho de fazer fetch, rebase/merge, e push é bastante comum. Em lições futuras vamos examinar versões mais complicadas desses fluxos de trabalho, mas por enquanto vamos tentar o seguinte.","","Para resolver este nível, faça o seguinte:","","* Clone o repositório","* Simule trabalho de seus colegas (1 commit)","* Faça um commit seu (1 commit)","* Publique seu trabalho usando *rebase*"]}}]},gl:{childViews:[{type:"ModalAlert",options:{markdowns:["## Traballo diverxente","","Ata agora vimos cómo descargar e mesturar os commits de outros e como empurrar os nosos. Parece bastante sinxelo, así que ¿cómo pode confundirse tanto a xente?","","A dificultade ven cando a historia dos repositorios *diverxe*. Antes de entrar nos detalles, vexamos un examplo...",""]}},{type:"ModalAlert",options:{markdowns:["Imaxínate que clonas un repositorio o luns e comezas a desenvolver algo. Para o venres, xa estás listo para publicar o teu traballo, pero, ¡oh, oh! Os teus colegas tamén fixeron código durante a semana, facendo que o teu traballo quede desactualizado (e obsoleto). Ademáis, eles publicaron eses commits no repositorio remoto, así que agora o *teu* traballo está baseado nunha versión *vella* do proxecto, que xa non lle interesa a ninguén.","","Neste caso, o comando `git push` é ambiguo. Se executas `git push`, ¿git debería mudar o repositorio para como estaba o luns? ¿Deberías arranxar o teu código sen eliminar o código novo? ¿Ou debería ignorar completamente os teus cambio porque xa están desactualizados?","","Como hai tanta ambiguedade nesta situación (na que a historia diverxeu), git non che permite empurrar os teus cambios. En cambio, fórzate a integrar o último estado do respositorio remoto antes de poder compartir o teu traballo."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["¡Demasiada charla, vexámolo en acción!"],afterMarkdowns:["¿Ves? Non pasou nada, porque o comando falla. `git push` falla porque `C3`, o teu commit máis recente, está baseado no remoto sobre `C1`. O remoto foi actualizado a `C2` dende entonces, polo que git rechaza o teu push."],command:"git push",beforeCommand:"git clone; git fakeTeamwork; git commit"}},{type:"ModalAlert",options:{markdowns:["¿Cómo resolves esta situación? É sinxelo, todo o que tes que facer é basear o teu traballo na versión máis recente da rama remota.","","Hai un par de formas de facer esto, pero a máis sinxela é mover o teu traballo facendo un rebase. Probémolo a ver  cómo se ve."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Agora, se facemos rebase antes de empurrar..."],afterMarkdowns:["¡Boom! Actualizamos a nosa representación local do remoto con `git fetch`, rebasamos o noso traballo para reflexar os novos cambios do remoto, e despois os empurramos con `git push`"],command:"git fetch; git rebase o/master; git push",beforeCommand:"git clone; git fakeTeamwork; git commit"}},{type:"ModalAlert",options:{markdowns:["¿Hai outra forma de actualizar o meu traballo se actualizaran o repositorio remoto? ¡Pois claro! Vexamos cómo facer o mesmo pero empregando `merge`.","","Por máis que `git merge` non mova o teu traballo (só crea un commit de merge), é un modo de decirlle a git que integrase tódolos cambios do remoto. Esto é porque agora unha rama remota pasou a ser un *ancestro* da tua propia rama, o que significa que o teu commit reflexa os cambios de tódolos commits da rama remota.","","Vexamos unha mostra..."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Si no lugar de rebasar facemos un merge..."],afterMarkdowns:["¡Boom! Actualizamos a nosa representación local do remoto usando `git fetch`, *mesturamos* ou *mergeamos* o novo traballo xunto co noso (para reflexar os novos cambios no remoto), e despois os empurramos empregando `git push`"],command:"git fetch; git merge o/master; git push",beforeCommand:"git clone; git fakeTeamwork; git commit"}},{type:"ModalAlert",options:{markdowns:["¡Asombroso! ¿Hai forma de facer esto sen escreber tantos comandos?","","¡Claro que sí! Xa sabes que `git pull` é sinxelamente un atallo para facer fetch e merge. Ademáis, ¡`git pull --rebase` é un atallo para facer fetch e rebase!","","Vexamos estos atallos funcionando."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Primeiro con `--rebase`..."],afterMarkdowns:["¡Igual que antes! Só que máis corto."],command:"git pull --rebase; git push",beforeCommand:"git clone; git fakeTeamwork; git commit"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["E agora un `pull` común"],afterMarkdowns:["Outra vez, ¡exactamente o mesmo que antes!"],command:"git pull; git push",beforeCommand:"git clone; git fakeTeamwork; git commit"}},{type:"ModalAlert",options:{markdowns:["Toda esta movida de fetchear, rebasear/mergear e pushear é bastante común. Nas seguintes leccións imos ver formas máis complexas de estes fluxos de traballo, pero por agora probemos o que vimos.","","Para resolver este nivel, fai o siguiente:","","* Clona o teu repositorio","* Simula algo de trabajo dun colega (1 commit)","* Commitea algo de traballo propio (1 commit)","* Publica o teu traballo *rebasando*"]}}]},zh_TW:{childViews:[{type:"ModalAlert",options:{markdowns:["## Diverged Work","","到目前為止我們已經知道如何 `pull` 其他人所送的 commit，而且也知道如何 `push` 我們自己的 commit，感覺很簡單，但是為什麼有人看起來很困惑？","","當 repo 的歷史紀錄是 *diverge（branch 走向不同）* 的狀態時就會很棘手，在討論這個之前，讓我們先來看一個例子...",""]}},{type:"ModalAlert",options:{markdowns:["想像一下你在星期一的時候 clone 了一個 repo，並且開始在設計一個功能，在星期五的時候你準備好要發佈你的新功能，但是非常不幸地，你的同事已經寫了一連串的程式碼並且已經將 commit 發佈到 remote，所以現在*你的*進度是在一個比較*舊*的版本的後面（如果與 remote 比較的話啦！）。","","在這種情況底下，使用 `git push` 會有問題，如果你使用 `git push`，那麼 git 應該要把 remote 退回到星期一的狀態？它應該要把你所寫好的程式碼一起更新進去，同時不會影響你的同事寫好的程式碼？或者是他應該要因為版本比較舊而完全忽略你的程式碼？","","因為在這種情況下會很麻煩（當 git 歷史紀錄被 diverge 了），所以 git 不會允許你 `push` 你的 commit。在你上傳你的 commit 之前，它實際上會先強迫你先跟 remote 同步。"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["講太多了啦！讓我們實際看一下這個情況。"],afterMarkdowns:["看到了沒？因為指令失敗了，所以沒有任何事情發生。 `git push` 失敗的原因是因為你最近的 commit `C3` 是在 `C1` 的後面，但是 remote 那邊是 `C2` 在 `C1` 的後面，所以 git 才會拒絕你的 push。"],command:"git push",beforeCommand:"git clone; git fakeTeamwork; git commit"}},{type:"ModalAlert",options:{markdowns:["你要如何解決這種情況？很簡單，你只需要把 `C3` 接在 remote 最新的版本 `C2` 的後面就可以了。","","有一些方法可以做到，但是最直接的方式是用 rebase，我們來做看看。"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["在我們 push 之前，先來做 rebase..."],afterMarkdowns:["看吧！我們利用 `git fetch` 下載了 remote 上面的 commit，並且 rebase 我們的 commit，使得我們的 commit 可以接在 remote 上面最新的版本的後面，接著透過 `git push` 就可以上傳更新了。"],command:"git fetch; git rebase o/master; git push",beforeCommand:"git clone; git fakeTeamwork; git commit"}},{type:"ModalAlert",options:{markdowns:["在 remote 已經率先更新之後，還有沒有其它方法可以上傳我們的 commit？當然有阿！我們這次利用 `merge` 來做看看！","","雖然 `git merge` 並不會去移動你的 commit（反而會產生一個 merge commit），這是一個告訴 git 你已經下載了 remote 上面的 commit 並且在 local repo 中已經做完 merge，而因為 remote branch 上的最新的 commit 現在已經是 merge commit 的一個 *ancestor*，這就表示你的 commit 已經包含了在 remote branch 上的所有 commit。","","讓我們來看一下這種情況..."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["現在假設我們不是用 rebase，而是用 merge..."],afterMarkdowns:["看吧！我們藉由 `git fetch` 把 remote 上的 commit 下載下來，並且 *merged* 該 commit 到我們目前的 branch（這樣就表示我們產生的 merge commit 有包含了 remote　上的 commit），接著再透過 `git push` 上傳到 remote。"],command:"git fetch; git merge o/master; git push",beforeCommand:"git clone; git fakeTeamwork; git commit"}},{type:"ModalAlert",options:{markdowns:["太棒了! 有沒有其它可以不用打這麼多指令的方法？","","當然有阿！你已經知道 `git pull` 就是表示一個 fetch 跟一個 merge。 有一個指令非常方便，那就是 `git pull --rebase`，它表示的是一個 fetch 以及一個 rebase。","","我們來看如何使用這個簡化後的指令。"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["首先 `--rebase`..."],afterMarkdowns:["跟之前一樣！只是少打了很多指令。"],command:"git pull --rebase; git push",beforeCommand:"git clone; git fakeTeamwork; git commit"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["現在用一般的 `pull`"],afterMarkdowns:["又來了，剛好跟之前的一樣！"],command:"git pull; git push",beforeCommand:"git clone; git fakeTeamwork; git commit"}},{type:"ModalAlert",options:{markdowns:["fetch，rebase/merge，以及 push 的流程是幾乎一樣的。在之後的教學中我們會看到比這些流程更複雜的版本。但是現在讓我們先牛刀小試一下。","","為了要完成這一關，請按照下面的步驟：","","* clone 你的 repo","* 假裝送一個 commit 給 remote","* 送一個 commit 給 local repo","* 透過 *rebase* 送自己的 commit"]}}]},zh_CN:{childViews:[{type:"ModalAlert",options:{markdowns:["## 偏离的工作","","现在我们已经知道了如何从其它地方 `pull` 提交记录，以及如何 `push` 我们自己的变更。看起来似乎没什么难度，但是为何还会让人们如此困惑呢？","","困难来自于远程库提交历史的**偏离**。在讨论这个问题的细节前，我们先来看一个例子……",""]}},{type:"ModalAlert",options:{markdowns:["假设你周一克隆了一个仓库，然后开始研发某个新功能。到周五时，你新功能开发测试完毕，可以发布了。但是 —— 天啊！你的同事这周写了一堆代码，还改了许多你的功能中使用的 API，这些变动会导致你新开发的功能变得不可用。但是他们已经将那些提交推送到远程仓库了，因此你的工作就变成了基于项目**旧版**的代码，与远程仓库最新的代码不匹配了。","","这种情况下, `git push` 就不知道该如何操作了。如果你执行 `git push`，Git 应该让远程仓库回到星期一那天的状态吗？还是直接在新代码的基础上添加你的代码，异或由于你的提交已经过时而直接忽略你的提交？","","因为这情况（历史偏离）有许多的不确定性，Git 是不会允许你 `push` 变更的。实际上它会强制你先合并远程最新的代码，然后才能分享你的工作。"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["说了这么多，咱们还是看看实际案例吧！"],afterMarkdowns:["看见了吧？什么都没有变，因为命令失败了！`git push` 失败是因为你最新提交的 `C3` 基于远程分支中的 `C1`。而远程仓库中该分支已经更新到 `C2` 了，所以 Git 拒绝了你的推送请求。"],command:"git push",beforeCommand:"git clone; git fakeTeamwork; git commit"}},{type:"ModalAlert",options:{markdowns:["那该如何解决这个问题呢？很简单，你需要做的就是使你的工作基于最新的远程分支。","","有许多方法做到这一点呢，不过最直接的方法就是通过 rebase 调整你的工作。咱们继续，看看怎么 rebase！"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["如果我们在 push 之前做 rebase 呢？"],afterMarkdowns:["我们用 `git fetch` 更新了本地仓库中的远程分支，然后用 rebase 将我们的工作移动到最新的提交记录下，最后再用 `git push` 推送到远程仓库。"],command:"git fetch; git rebase o/master; git push",beforeCommand:"git clone; git fakeTeamwork; git commit"}},{type:"ModalAlert",options:{markdowns:["还有其它的方法可以在远程仓库变更了以后更新我的工作吗? 当然有，我们还可以使用 `merge`","","尽管 `git merge` 不会移动你的工作（它会创建新的合并提交），但是它会告诉 Git 你已经合并了远程仓库的所有变更。这是因为远程分支现在是你本地分支的祖先，也就是说你的提交已经包含了远程分支的所有变化。","","看下演示..."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["咱们们用 merge 替换 rebase 来试一下……"],afterMarkdowns:["我们用 `git fetch` 更新了本地仓库中的远程分支，然后**合并**了新变更到我们的本地分支（为了包含远程仓库的变更），最后我们用 `git push` 把工作推送到远程仓库"],command:"git fetch; git merge o/master; git push",beforeCommand:"git clone; git fakeTeamwork; git commit"}},{type:"ModalAlert",options:{markdowns:["很好！但是要敲那么多命令，有没有更简单一点的？","","当然 —— 前面已经介绍过 `git pull` 就是 fetch 和 merge 的简写，类似的 `git pull --rebase` 就是 fetch 和 rebase 的简写！","","让我们看看简写命令是如何工作的。"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["这次用 `--rebase`……"],afterMarkdowns:["跟之前结果一样，但是命令更短了。"],command:"git pull --rebase; git push",beforeCommand:"git clone; git fakeTeamwork; git commit"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["换用常规的 `pull`"],afterMarkdowns:["还是跟以前一样! "],command:"git pull; git push",beforeCommand:"git clone; git fakeTeamwork; git commit"}},{type:"ModalAlert",options:{markdowns:["由 fetch、rebase/merge 和 push 组成的工作流很普遍。后续课程我们会讲解更复杂的工作流，不过现在我们先解决这个关卡吧。","","要完成本关，你需要完成以下几步：","","* 克隆你的仓库","* 模拟一次远程提交（fakeTeamwork）","* 完成一次本地提交","* 用 *rebase* 发布你的工作"]}}]},de_DE:{childViews:[{type:"ModalAlert",options:{markdowns:["## Abweichende Inhalte","","Bisher haben wir gesehen wie man per `pull` Commits von Anderen ins lokale Repository holt und die eigenen Änderungen in ein entferntes `push`t. Ist doch ziemlich einfach, wie kann man da durcheinander kommen?","","Die Schwierigkeiten entstehen, wenn die Historys der beiden Repositorys *divergieren*, also voneinander abweichen. Bevor wir die Einzelheiten besprechen, schauen wir uns ein Beispiel an ...",""]}},{type:"ModalAlert",options:{markdowns:["Stell dir vor du holst dir Montags ein Repository per `clone` und fängst an, an einem Feature zu arbeiten. Bis Freitag soll es fertig und veröffentlicht sein -- doch, oh je! Deine Kollegen haben eine Menge Code während der Woche geschrieben, der dein Feature hat veralten lassen (und überflüssig gemacht hat). Sie haben diesen Code außerdem zum entfernten Repository gepusht, und dadurch basiert *deine* harte Arbeit jetzt auf einer *alten* Version des Projektes, die nicht länger relevant ist.","","In diesem Fall ist ein `git push` problematisch. Wenn du es ausführst, soll Git das entfernte Repository in den Zustand von Montag zurückversetzen? Soll es versuchen deinen Code auf die aktuelle Version zu packen? Oder soll es deine Änderungen einfach ignorieren, weil sie total veraltet sind?","","Da es in dieser Situation so viele Mehrdeutigkeiten gibt (da die Historys divergent sind) erlaubt Git dir nicht, deine Änderungen einfach zu `push`en. Es zwingt dich, zuerst die neuesten Änderungen vom Server zu holen und in deine zu integrieren bevor du deine Arbeit mit anderen teilen kannst."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Bla bla bla. Schauen wir uns das lieber in Aktion an:"],afterMarkdowns:["Siehst du? Nichts passiert, weil der Befehl fehlschlägt. `git push` schlägt fehl, weil der neueste Commit `C3` auf dem Commit `C1` des Remotes basiert. Der entfernte Server hat mittlerweile jedoch `C2` gepusht bekommen, also lässt Git deinen Push jetzt nicht mehr zu."],command:"git push",beforeCommand:"git clone; git fakeTeamwork; git commit"}},{type:"ModalAlert",options:{markdowns:["Wie sollen wir das auflösen? Es ist ganz einfach, du musst deinen Commit nur von der aktuellsten Version des Remotes ableiten.","","Es gibt verschiedene Möglichkeiten wie man das erreichen kann, aber die offensichtlichste ist es, deine Commits per Rebase zu verschieben. Schauen wir mal wie das abläuft:"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Also wenn wir vor dem Push erst mal einen Rebase machen ..."],afterMarkdowns:["Bämm! Wir haben unsere lokale Abbildung des entfernten Repositorys mit `git fetch` auf den neuesten Stand gebracht, unsere Arbeit auf die neueste Version des Remotes drauf gepackt und dann mit `git push` auf den Server geschoben."],command:"git fetch; git rebase o/master; git push",beforeCommand:"git clone; git fakeTeamwork; git commit"}},{type:"ModalAlert",options:{markdowns:["Gibt es noch weitere Möglichkeiten deine Arbeit zu aktualisieren wenn das entfernte Repository neue Commits bekommen hat? Klar! Schauen wir uns dasselbe an, aber diesmal arbeiten wir mit `merge`.","","Obwohl `git merge` deine Arbeit nicht verschiebt (und stattdessen einen Merge Commit erzeugt) ist es eine Möglichkeit Git dazu zu bringen, alle Änderungen vom Remote in deine Sachen zu integrieren. Denn durch den Merge wird der Remote Branch zu einem *Vorgänger* deines Branches, was bedeutet dass dein Commit alle Commits des entfernten Branches beinhaltet.","","Zur Demonstration ..."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Wenn wir nun also mergen anstatt einen Rebase zu machen ..."],afterMarkdowns:["Ok. Wir haben die lokale Abbildung des entfernen Repositorys mit `git fetch` aktualisiert, die neuen Änderungen per *Merge* in deine integriert, und letztere dann mit `git push` auf den Server gebracht."],command:"git fetch; git merge o/master; git push",beforeCommand:"git clone; git fakeTeamwork; git commit"}},{type:"ModalAlert",options:{markdowns:["Wahnsinn! Kann ich das auch irgendwie machen ohne soviel zu tippen?","","Na klar -- du kennst ja schon `git pull` als Zusammenfassung von `fetch` und `merge`. Praktischerweise bringt man es mit der Option `--rebase` dazu, anstatt des Merge einen Rebase zu machen.","","Gucken wir uns das mal an."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Zunächst `git pull --rebase` ..."],afterMarkdowns:["Genau wie vorher! Nur viel kürzer."],command:"git pull --rebase; git push",beforeCommand:"git clone; git fakeTeamwork; git commit"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Und nun das normale `git pull` ..."],afterMarkdowns:["Und wieder, genau wie zuvor!"],command:"git pull; git push",beforeCommand:"git clone; git fakeTeamwork; git commit"}},{type:"ModalAlert",options:{markdowns:["Dieser Ablauf von `fetch`, `rebase` / `merge` und `push` ist sehr verbreitet. In zukünftigen Leveln werden wir uns kompliziertere Varianten dieses Workflows ansehen, aber jetzt probieren wir erst mal diesen aus.","","Um diesen Level zu lösen, gehe folgende Schritte durch:","","* Clone dein Repository","* Simuliere einen entfernten Commit mit `git fakeTeamwork`","* Erzeuge einen lokalen Commit","* Benutze *Rebase*, um deine Arbeit schließlich pushen zu können"]}}]},ru_RU:{childViews:[{type:"ModalAlert",options:{markdowns:["## Когда наработки расходятся","","Вот мы и познакомились с тем, как забирать (`pull`) чужие коммиты и как закачивать (`push`) свои наработки и изменения. Выглядит всё довольно просто, и не ясно какие же могут возникать у людей трудности со всем этим?","","Сложности возникают тогда, когда история репозитория *расходится*. Прежде чем идти дальше, давайте посмотрим на пример...",""]}},{type:"ModalAlert",options:{markdowns:["Представьте себе, вы склонировали репозиторий в понедельник и начали разрабатывать какую-то новую и уникальную часть приложения (на сленге разработчиков - `фича`). В пятницу вечером вы наконец-то готовы опубликовать вашу фичу. Но, о нет! Ваш коллега в течение недели написал кучу кода, который делает все ваши наработки устарелыми. Этот код был также закоммичен и опубликован на общедоступном удалённом репозитории, поэтому теперь *ваш* код базируется на *устаревшей* версии проекта и более не уместен.","","В этом случае использование команды `git push` является сомнительным. Как поведёт себя команда `git push`, если вы её выполните? Может быть, она изменит удалённый репозиторий и вернёт всё к тому состоянию, которое было в понедельник? А может, команда попробует добавить ваш код, не удаляя при этом новый? Или же она проигнорирует ваши изменения, так как они уже устарели?","","По причине того, что в данной ситуации (когда история расходится) слишком много двусмысленностей и неопределённостей, git не даст вам закачать (`push`) ваши изменения. Он будет принуждать вас включить в состав своей работы все те последние наработки и изменения, которые находятся на удалённом репозитории."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Слишком много болтовни! Давайте посмотрим, как всё работает на живом примере"],afterMarkdowns:["Видите? Ничего не произошло. Всё потому, что команда `git push` не выполнилась успешно. Дело в том, что ваш последний коммит `C3` основан на удалённом коммите `C1`. В свою очередь, удалённый репозиторий уже изменился под воздействием `C2`. Вот почему git отклонил ваш push."],command:"git push",beforeCommand:"git clone; git fakeTeamwork; git commit"}},{type:"ModalAlert",options:{markdowns:["Как же разрешить данную ситуацию? Всё очень просто! Всё, что вам нужно - перебазировать свою работу на самую последнюю версию удалённой ветки.","","Существует множество способов сделать это, но наиболее простой способ 'сдвинуть' свои наработки - через перебазировку или rebasing. Давайте посмотрим, как это выглядит."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Теперь, когда мы сперва перебазируемся прежде чем публиковать изменения..."],afterMarkdowns:["Опа! Мы только что обновили наш локальный образ удалённого репозитория средствами `git fetch`. Ещё мы перебазировали наши наработки, чтобы они отражали все изменения с удалённого репозитория, и опубликовали их с помощью `git push`"],command:"git fetch; git rebase o/master; git push",beforeCommand:"git clone; git fakeTeamwork; git commit"}},{type:"ModalAlert",options:{markdowns:["А есть ещё какие-либо варианты обновить мои наработки к тому моменту, как удалённый репозиторий был обновлён? Конечно есть! Давайте ознакомимся с парочкой новых штучек, но в этот раз с помощью команды `merge`.","","Несмотря на то, что `git merge` не передвигает ваши наработки (а всего лишь создаёт новый коммит, в котором Ваши и удалённые изменения объединены), этот способ помогает указать git-у на то, что вы собираетесь включить в состав ваших наработок все изменения с удалённого репозитория. Это значит, что ваш коммит отразится на всех коммитах удалённой ветки, поскольку удалённая ветка является *предком* вашей собственной локальной ветки.","","Давайте взглянем на демонстрацию..."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Таким образом, если мы объединим (merge) вместо перебазирования (rebase)..."],afterMarkdowns:["Опа! Мы обновили наше локальное представление удалённого репозитория с помощью `git fetch`, *объединили* ваши новые наработки с нашими наработками (чтобы отразить изменения в удалённом репозитории) и затем опубликовали их с помощью `git push`"],command:"git fetch; git merge o/master; git push",beforeCommand:"git clone; git fakeTeamwork; git commit"}},{type:"ModalAlert",options:{markdowns:["Здорово! А можно ли как-то сделать всё то же самое, но с меньшим количеством команд?","","Конечно - ведь вы уже знаете команду `git pull`, которая является аналогом и более кратким аналогом для совместных fetch и merge. А команда `git pull --rebase` - аналог для совместно вызванных fetch и rebase!","","Давайте взглянем на эти оба варианта."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Сперва - с флагом `--rebase`..."],afterMarkdowns:["Тот же результат, как и ранее, но намного короче вызов команд."],command:"git pull --rebase; git push",beforeCommand:"git clone; git fakeTeamwork; git commit"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["А теперь с обычным `pull`"],afterMarkdowns:["И снова - результат такой же, как и ранее!"],command:"git pull; git push",beforeCommand:"git clone; git fakeTeamwork; git commit"}},{type:"ModalAlert",options:{markdowns:["Рабочий процесс получения изменений (fetching), перебазирования/объединения (rebase/merging) и публикации изменений (pushing) используется довольно часто. В последующих уроках мы изучим более сложные варианты этих рабочих процессов, но пока что давайте остановимся на том, что есть.","","Чтобы выполнить задание уровня, сделайте следующее:","","* Склонируйте репозиторий","* Сфабрикуйте командную работу (1 коммит)","* Сделайте свой собственный коммит (1 коммит)","* Опубликуйте свои наработки посредством *перебазировки (rebasing)*"]}}]},ja:{childViews:[{type:"ModalAlert",options:{markdowns:["## 分かれた作業","","これまでは、どのようにして`pull`でコミットを取り込み、`push`で自身の変更を反映するかを見てきました。単純なようにみえます。では何故人々は混乱するのでしょうか？","","その難しさは、リポジトリの履歴が*分岐*することに起因します。この詳細について説明する前に、まずは例を見てみましょう。",""]}},{type:"ModalAlert",options:{markdowns:["月曜日にリポジトリをクローンし、ある表面の機能をちょっと弄ることを想像してみてください。金曜日までに、あなたはその機能を公開する準備ができる -- しかし、ああなんということでしょう！あなたの同僚達は、あなたの機能が依存していた（そして、廃れた）コードの束をその週の内に書き換えていました。彼らはリモートリポジトリにコミットを共有して公開し、今や*あなたの*作業は*古い*バージョンのもはや適切でないプロジェクトに基づいていることになります。","","この場合、`git push`コマンドは曖昧になってしまいます。あなたが`git push`を走らせたとき、gitはリモートリポジトリは月曜の状態に変更を戻すべきでしょうか？それとも、新しいコードを取り除かないで追加しようとしてみるべきでしょうか？または、あなたの変更が完全に古いものになってしまったため、全て無視するべきなのでしょうか？","","この状況（履歴が分岐をしているとき）ではまったくもって曖昧なので、gitはあなたの変更を`push`することを許可しません。実際には、あなたの作業を共有する前に最新のリモートの状態を取り込むことを強制します。"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["話しすぎましたね！この状況での動作をみてみましょう！"],afterMarkdowns:["見ましたか？コマンドが失敗して、何も起こりませんでした。あなたの最近の`C3`コミットはリモートの`C1`コミットに依存しているため、`git push`は失敗しました。リモートには`C2`が更新されているので、gitはあなたのプッシュを拒否します。"],command:"git push",beforeCommand:"git clone; git fakeTeamwork; git commit"}},{type:"ModalAlert",options:{markdowns:["ではこの状況を解決するにはどうしたらいいでしょう？簡単です、リモートブランチの最新の状態にあなたの作業が基づくようにすればいいのです。","","いくつか方法はありますが、最も簡単なのはあなたの作業をリベースで移動させることです。それがどのようなものか、さあみてみましょう。"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["今、プッシュをする前に代わりにリベースをしてみましょう。"],afterMarkdowns:["わお！私たちは`git fetch`でローカルのリモートブランチを更新し、私たちの作業をリベースさせてリモートの新しい変更に適用させ、`git push`でそれをプッシュしました。"],command:"git fetch; git rebase o/master; git push",beforeCommand:"git clone; git fakeTeamwork; git commit"}},{type:"ModalAlert",options:{markdowns:["リモートリポジトリが更新されたとき、他に自身の作業を更新する方法はあるでしょうか？もちろん、あります！今度は同じことを`merge`を代わりに使ってやってみましょう。","","`git merge`はあなたの作業を移動しませんが（代わりにマージコミットを作ります）、リモートの変更を全て取り込みgitに通知する方法なのです。この通知とは、リモートブランチが今やあなた自身のブランチの*親*を指していることになるため、あなたのリモートブランチの全ての変更を反映しているコミットを指します。","","この状況の例を見てみましょう。"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["リベースの代わりに今度はマージを用います。"],afterMarkdowns:["わお！私たちは`git fetch`でローカルのリモートブランチを更新し、私たちの作業を*マージ*して（リモートの新しい変更を反映するために）、`git push`でそれをプッシュしました。"],command:"git fetch; git merge o/master; git push",beforeCommand:"git clone; git fakeTeamwork; git commit"}},{type:"ModalAlert",options:{markdowns:["素晴らしい！多くのコマンドを打たないでこれを実現する方法はあるでしょうか？","","もちろん -- あなたが既に知っているコマンドです。`git pull`は、`fetch`して`merge`するためのより短い書き方です。さらに便利なことに、`git pull --rebase`は`fetch`して`rebase`することの省略形です！","","コマンドを省略した場合を見てみましょう。"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["まずは、`--rebase`から"],afterMarkdowns:["前と一緒です！そしてとても短いです。"],command:"git pull --rebase; git push",beforeCommand:"git clone; git fakeTeamwork; git commit"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["そして通常使う`pull`で試してみましょう"],afterMarkdowns:["ここでも、前と同じです！"],command:"git pull; git push",beforeCommand:"git clone; git fakeTeamwork; git commit"}},{type:"ModalAlert",options:{markdowns:["この取り込み作業の流れ、リベースとマージ、そしてプッシュはとてもよく行います。次回以降のレッスンではより複雑なパターンの作業を学びますが、今は習ったことをとりあえず試してみましょう。","","このレベルをクリアするには、以下のステップを踏みます:","","* あなたのリポジトリをクローン","* 擬似的に幾つかの同僚の変更を真似る（1コミット）","* あなた自身の作業をコミット（1コミット）","* あなたの作業を*リベース*で公開"]}}]},uk:{childViews:[{type:"ModalAlert",options:{markdowns:["## Розбіжності в історії","","Ми розглянули як витягувати (`pull`) коміти інших та як завантажувати (`push`) свої власні коміти. Це виявилось не надто складно, то як же так, що в людей дуже часто виникають з цим труднощі?","","Основна складність полягає в тому, що історія різних репозиторіїв *розбігається*. Перед тим, як вдатися в деталі, подивімося як це виглядає на прикладі...",""]}},{type:"ModalAlert",options:{markdowns:["Уяви, що ти склонував репозиторій в понеділок і почав працювати над якоюсь фічею. В пятницю фіча готова і ти хочеш повернути її назад (в апстрім) -- але що це? Твої колеги, грець їм, вже встигли вкомітити купу коду що робить твою фічу застарілою (і не дуже доречною). Вони вже запушили ці коміти в публічний репозиторій, й тепер *твоя* робота базується на *старій* версії продукту, що вже не актуальна.","","В цьому випадку команда `git push` неоднозначна. Коли ти виконаєш `git push`, гіт повинен змінити віддалений репозиторій до того стану, на якому він знаходився в понеділок? Чи він має додати твій код і залишити код твоїх колег? Чи він має повністю проігнорувати твої зміни, оскільки вони застаріли?","","Через такі неоднозначності в цій ситуації (коли історія розійшлася), git не дозволить тобі запушити твої зміни. Він фактично змушує тебе інтегрувати останні зміни з віддаленого репозиторію перед тим як ти зможеш завантажити на нього свої напрацювання."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Але, забагато розмов! Подивімось на ділі!"],afterMarkdowns:["Бачиш? Нічого не сталося тому що остання команда не виконалася. `git push` не спрацював тому що твій недавній коміт `C3` базується на коміті `C1`. Але віддалений репо вже прейшов на`C2`, тому git відхилив твій push."],command:"git push",beforeCommand:"git clone; git fakeTeamwork; git commit"}},{type:"ModalAlert",options:{markdowns:["Як вийти з цієї ситуації? Дуже просто! Все, що треба -- це оновити свої напрацювання так, щоб вони базувалися на останніх змінах з віддаленої гілки.","","Є кілька шляхів як цього досягнути, але найпростіший -- це перемістити свою роботу 'вперед' за допомогою rebase. Спробуймо і погляньмо як це виглядає."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Тепер якщо виконати rebase перед push..."],afterMarkdowns:["Ка-бум! Ми оновили наш локальний образ віддаленого репозиторію за допомогою `git fetch`, заребейсили наші напрацювання відповідно до змін у віддаленому репо, й завантажили їх за допомогою `git push`."],command:"git fetch; git rebase o/master; git push",beforeCommand:"git clone; git fakeTeamwork; git commit"}},{type:"ModalAlert",options:{markdowns:["Чи є якийсь інший спосіб оновити свої напрацювання, коли віддалений репозиторій пішов вперед? Звісно! Спробуймо зробити те ж саме, але натомість за допомогою `merge` (злиття).","","Хоча `git merge` і не переміщує твою роботу (а просто створює натомість коміт злиття чи merge commit), це -- ще один спосіб сказати git, що ти інтегрував останній стан віддаленого репозиторію в свої зміни. Це працює тому, що тепер віддалена гілка є *предком* твоєї гілки, а отже твої останні коміти інтегрують в собі всі коміти з віддаленої гілки.","","Невелика демонстрація..."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Тепер ми зробимо merge замість rebase..."],afterMarkdowns:["Ка-бум! Ми оновили наш локальний образ віддаленої гілки за допомогою `git fetch`, *змерджили* нові напрацювання з власними (щоб відобразити останні зміни у віддаленій гілці), й відіслали їх за допомогою `git push`"],command:"git fetch; git merge o/master; git push",beforeCommand:"git clone; git fakeTeamwork; git commit"}},{type:"ModalAlert",options:{markdowns:["Чудово! Чи можу я це зробити, використовуючи меншу кількість команд?","","Звісно -- ти ж знаєш, що `git pull` це просто коротша форма для git fetch а потім git merge. Натомість, `git pull --rebase` це коротка форма для git fetch а потім git rebase!","","Спробуймо використати ці коротші команди."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Спочатку з `--rebase`..."],afterMarkdowns:["Те саме, що й раніше! Просто трохи коротше."],command:"git pull --rebase; git push",beforeCommand:"git clone; git fakeTeamwork; git commit"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["А тепер просто з `pull`"],afterMarkdowns:["Знову, так як і було!"],command:"git pull; git push",beforeCommand:"git clone; git fakeTeamwork; git commit"}},{type:"ModalAlert",options:{markdowns:["Робочий процес, що складається з fetch, rebase/merge і push є дуже широковживаним. В наступних уроках ми розглянемо складніші версії цього процесу, а наразі спробуймо його виконати.","","Щоб пройти цей рівень, виконай наступні кроки:","","* Склонуй свій репозиторій","* Зроби симуляцію командної роботи (1 коміт)","* Зроби власний коміт (1 коміт)","* Опублікуй свої напрацювання за допомогою *rebasе*"]}}]},ko:{childViews:[{type:"ModalAlert",options:{markdowns:["## 엇갈린 작업","","지금까지 우리는 다른곳에서 커밋을 `pull`해서 내려받고 우리가 만든 변경들을 `push`하는 방법을 배웠습니다. 간단해보이는데, 왜 사람들이 이것 때문에 곤란해 할까요?","","어려움은 저장소의 히스토리가 *엇갈릴 때* 찾아옵니다. 자세히 살펴보기 전에 예제를 확인해봅시다...",""]}},{type:"ModalAlert",options:{markdowns:["상상을 해봅시다. 여러분은 월요일에 저장소를 clone해서 부가기능을 만들기 시작했습니다. 금요일쯤 기능을 공개할 준비가 되었습니다 -- 그런데 오 이런! 동료들이 주중에 코딩을 잔뜩해서 여러분이 만든 기능은 프로젝트에 뒤떨어져서 무용지물이 되었습니다. 이 사람들이 그 커밋들을 공유하고있는 원격 저장소에도 공개했습니다, 이제 *여러분의* 작업은 이제 의미가 없는 *구*버전의 프로젝트를 기반으로한 작업이 되어버렸습니다.","","이런 경우, 명령어 `git push`가 할 일이 애매해집니다. `git push`를 수행했을때, git은 원격 저장소를 여러분이 작업했던 월요일의 상태로 되돌려야 할까요? 아니면 새 코드를 건들지 않고 여러분의 코드만 추가해야 되나요? 아니면 여러분의 작업은 뒤 떨어졌기 때문에 완전히 무시해야되나요?","","이렇게 상황이 애매모호하기 때문에(히스토리가 엇갈렸기 때문이죠), git은 여러분이 `push`하지 못하게 합니다. 사실 여러분이 작업을 공유하기전에 원격 저장소의 최신 상태를 합치도록 강제합니다."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["너무 떠든거같습니다! 이 상황을 직접 눈으로 확인해봅시다"],afterMarkdowns:["보이죠? 명령어가 실행되지 않아서 아무것도 잃어나지 않습니다. 여러분의 최근 커밋 `C3`가 원격저장소의 `C1`을 기반으로 하기 때문에 `git push`가 실패합니다. 원격 저장소는 `C2`까지 갱신된 상태기때문에 git은 여러분의 push를 거부하게됩니다."],command:"git push",beforeCommand:"git clone; git fakeTeamwork; git commit"}},{type:"ModalAlert",options:{markdowns:["그러면 이 상황을 어떻게 해결할까요? 쉽습니다, 여러분의 작업을 원격 브랜치의 최신상태를 기반으로 하게 만들면 됩니다.","","이렇게 하기위한 방법이 여러가지가 있는데, 가장 간결한 방법은 리베이스를 통해 작업을 옮기는 방법입니다. 예제를 통해 눈으로 확인해 봅시다."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["push를 하기전에 리베이스를 하면..."],afterMarkdowns:["Boom! `git fetch`로 원격 저장소의 변경정보를 가져오고, 새 변경들로 우리 작업을 리베이스 했습니다, 이제 `git push`하면 끝!"],command:"git fetch; git rebase o/master; git push",beforeCommand:"git clone; git fakeTeamwork; git commit"}},{type:"ModalAlert",options:{markdowns:["다른 방법은 없냐고요? 당연히 있습니다! 같은것을 `merge`로 대신 해봅시다.","","`git merge`가 여러분의 작업을 옮기지는 않지만(merge 커밋을 생성합니다). git에게 원격 저장소의 변경을 합쳤다고 알려주는 방법중에 하나입니다. 이제 원격 브랜치가 여러분 브랜치의 *부모*기 되었기때문입니다, 여러분의 커밋이 원격 브랜치의 모든 커밋을 반영했다는 뜻이죠.","","눈으로 확인해봅시다..."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["리베이스대신 병합을하면..."],afterMarkdowns:["Boom! `git fetch`로 원격 저장소의 변경정보를 가져오고, 새 작업을 우리 작업으로 *병합*했습니다 (원격 저장소의 변경을 반영하기 위해서죠), 이제 `git push`하면 끝!"],command:"git fetch; git merge o/master; git push",beforeCommand:"git clone; git fakeTeamwork; git commit"}},{type:"ModalAlert",options:{markdowns:["멋집니다! 명령어를 좀더 적게써서 하는 방법은 없나요?","","물론 있습니다 -- 여러분은 `git pull`이 fetch와 merge의 줄임 명령어라는 것은 이미 알고 있을 것입니다. 아주 간단하게, `git pull --rebase`를 하면 fetch와 리베이스를 하는 작업의 줄임 명령어 입니다","","이 줄임 명령어가 잘 작동하는지 확인해 봅시다"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["먼저 `--rebase`와 함께하면..."],afterMarkdowns:["이전과 같습니다! 간결하고요."],command:"git pull --rebase; git push",beforeCommand:"git clone; git fakeTeamwork; git commit"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["일반의 `pull`과 사용했을 때는"],afterMarkdowns:["또다시, 이전과 같습니다!"],command:"git pull; git push",beforeCommand:"git clone; git fakeTeamwork; git commit"}},{type:"ModalAlert",options:{markdowns:["fetch를 하고 리베이스/병합을 하고 push를 하는 이런 작업흐름은 꽤 흔합니다. 앞으로의 레슨에서는 이런 작업흐름의 복잡한 버전들을 확인해볼 것입니다. 일단은 이것부터 연습해 보죠.","","이번 레벨을 통과하려면, 다음의 단계를 거쳐야 합니다:","","* 여러분의 저장소를 clone 하세요","* 가짜 팀워크를 만드세요 (1개의 커밋)","* 여러분의 작업도 커밋하세요 (1개의 커밋)","* 여러분의 작업을 *리베이스*를 통해 공유하세요"]}}]},vi:{childViews:[{type:"ModalAlert",options:{markdowns:["## Diverged Work","","Cho đến giờ ta đã biết cách `kéo`(`pull`) commit từ nơi khác về và cách `đẩy`(`push`) lên những thay đổi của ta. Chúng nhìn có vẻ khá đơn giản, vậy tại sao người ta lại thấy lúng túng về chúng?","","Khó khăn đến từ sự *dị biệt* của cây lịch sử trên kho chứa từ xa. Trước khi đi vào thảo luận chi tiết vấn đề này, hãy xem qua một ví dụ...",""]}},{type:"ModalAlert",options:{markdowns:["Tưởng tượng bạn sao chép một kho chứa vào thứ Hai và bắt đầu phát triển một tính năng mới. Đến thứ Sáu thì bạn đã sẵn sàng để xuất bản thành quả của mình -- nhưng không! Đồng nghiệp của bạn đã viết thêm hàng loạt mã trong một tuần vừa rồi và điều này làm cho chức năng của bạn trở nên lỗi thời. Và họ cũng đã xuất bản những commit này lên kho chứa từ xa chung, vậy giờ thành quả của *bạn* lại dựa trên phiên bản *cũ* của dự án mà nó không còn thích đáng nữa.","","Trong trường hợp này, lệnh `git push` trở lên khá nhập nhằng. Nếu bạn dùng `git push`, liệu git nên thay đổi kho chứa từ xa trơ rveef trạng thái ngày thứ Hai? Hay nó nên cố gắng thêm mã của bạn vào trong khi không xóa mã mới? Hay là nó sẽ bỏ qua hoàn toàn mã của bạn vì nó đã lỗi thời?","","Vì có quá nhiều tình huống mơ hồ (dị biệt lịch sử), git sẽ không cho phép bạn `đẩy`(`push`) thay đổi của mình. Nó sẽ ép bạn phải sát nhập trạng thái mới nhất của kho chứa từ xa vào thành phẩm của mình trước khi chia sẻ chúng."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Nói quá nhiều rồi! Đi vào hành động thôi"],afterMarkdowns:["Thấy chứ? Không có gì xảy ra cả vì lệnh bị thất bại. `git push` thất bại vì commit mới nhất của bạn: `C3` dựa trên commit `C1` ở nhánh từ xa. Nhánh đó đã được cập nhật lên commit `C2`, nên git từ chối lệnh đẩy của bạn"],command:"git push",beforeCommand:"git clone; git fakeTeamwork; git commit"}},{type:"ModalAlert",options:{markdowns:["Vậy thì giải quyết tình huống này sao giờ? Đơn giản thôi, tất cả những gì bạn cần làm là khiến cho thành quả của mình dựa trên phiên bản mới nhất của nhánh từ xa.","","Có vài cách để làm điều này, nhưng cách trực tiếp nhất là bố trí lại (dùng rebase) để di chuyển thành quả của bạn. Cùng xem cách nó hoạt động nào."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Nào bây giờ trước push ta dùng rebase thì..."],afterMarkdowns:["Bùùm! Ta đã cập nhật nhánh từ xa trong kho chứ cục bộ với `git fetch`, dịch chuyển thành quả của mình để phản ánh thay đổi mới của kho chứa từ xa, sau đó đẩy chúng lên với `git push`"],command:"git fetch; git rebase o/master; git push",beforeCommand:"git clone; git fakeTeamwork; git commit"}},{type:"ModalAlert",options:{markdowns:["Có cách nào khác để cập nhật thành quả của mình khi kho chứa từ xa được cập nhật không? Tất nhiên rồi! Hãy xem xét điều tương tự với `merge`.","","Mặc dù `git merge` không dịch chuyển commit của bạn (thay vì đó nó tạo ra một commit hơp nhất), đó là cách để nói với git rằng bạn đã kết hợp tất cả thay đổi từ nhánh từ xa. Đó là bởi vì bây giờ nhánh từ xa đã trở thành một *tổ tiên* của nhánh cục bộ của bạn, nghĩa là commit của bạn có thể tham chiếu điến tất cả commit có ở nhánh tù xa.","","Hãy xem qua bản biểu diễn sau..."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Giờ nếu ta dùng merge thay vày rebase thì..."],afterMarkdowns:["Bùùm! Ta đã cập nhật đại diện nhánh từ xa tại kho chứa địa phương với `git fetch`, *hợp nhất* (*merge*) thành quả mới vào thành quả của ta (để phản ánh thay đổi ở nhánh từ xa), sau đó đẩy chúng lên với `git push`"],command:"git fetch; git merge o/master; git push",beforeCommand:"git clone; git fakeTeamwork; git commit"}},{type:"ModalAlert",options:{markdowns:["Tuyệt vời! Có cách nào để làm việc này mà không phải gõ nhiều lệnh thế không nhỉ?","","Tất nhiên rồi -- bạn đã biết rằng `git pull` là lệnh tắt của fetch và merge. Tương tự như vậy, `git pull --rebase` là lệnh tắt của fetch và rebase!","","Hãy xem thử cách lệnh tắt này hoạt động ra sao."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Trước tiên với `--rebase`..."],afterMarkdowns:["Giống hệt như trước! Chỉ là lệnh ngắn hơn."],command:"git pull --rebase; git push",beforeCommand:"git clone; git fakeTeamwork; git commit"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Và giờ với lệnh `pull` thông thường"],afterMarkdowns:["Lại một lần nữa, chính xác y hệt như trước!"],command:"git pull; git push",beforeCommand:"git clone; git fakeTeamwork; git commit"}},{type:"ModalAlert",options:{markdowns:["Quy trình tìm nạp (fetch), bố trí lại/hợp nhất (rebase/merge), và đẩy (push) là khá phổ biết. Ta sẽ xem xét các phiên bản phức tạp hơn của những quy trình này ở các bài học sau, còn bây giờ thì hãy tập trung vào bài này đã.","","Để giải quyết cấp độ này, hãy làm các bước sau:","","* Nhân bản kho chứa của bạn","* Giả lập làm việc nhóm (1 commit)","* Tạo ra 1 commit địa phương","* Xuất bản thành quả của bạn dùng *rebase*"]}}]}}}},{}],136:[function(e,t,o){o.level={goalTreeString:'{"branches":{"master":{"target":"C1","id":"master","remoteTrackingBranchID":"o/master"},"o/master":{"target":"C1","id":"o/master","remoteTrackingBranchID":null},"feature":{"target":"C2","id":"feature","remoteTrackingBranchID":"o/feature"},"o/feature":{"target":"C2","id":"o/feature","remoteTrackingBranchID":null}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"},"C2":{"parents":["C1"],"id":"C2"}},"tags":{},"HEAD":{"target":"feature","id":"HEAD"},"originTree":{"branches":{"master":{"target":"C1","id":"master","remoteTrackingBranchID":null},"feature":{"target":"C2","id":"feature","remoteTrackingBranchID":null}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"},"C2":{"parents":["C1"],"id":"C2"}},"tags":{},"HEAD":{"target":"master","id":"HEAD"}}}',solutionCommand:"git reset --hard o/master;git checkout -b feature C2; git push origin feature",startTree:'{"branches":{"master":{"target":"C2","id":"master","remoteTrackingBranchID":"o/master"},"o/master":{"target":"C1","id":"o/master","remoteTrackingBranchID":null}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"},"C2":{"parents":["C1"],"id":"C2"}},"tags":{},"HEAD":{"target":"master","id":"HEAD"},"originTree":{"branches":{"master":{"target":"C1","id":"master","remoteTrackingBranchID":null}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"}},"tags":{},"HEAD":{"target":"master","id":"HEAD"}}}',hint:{en_US:"Make the feature branch from the local master before resetting it back to be the same as origin's master",de_DE:"Erstelle einen Feature-Branch ausgehend vom lokalen Master-Branch, bevor du den Master-Branch auf den origin/master zurücksetzt.",ru_RU:"Создайте новую feature ветвь от master перед тем, как откатить изменения в master до состояния o/master.",zh_CN:"从本地的master创建一个feature分支, 然后重置master和origin master保持一致。",es_ES:"Crea la rama feature desde la rama master en local antes de restablecerlo para que sea el mismo que la rama master de origen",fr_FR:"Créer la branche feature à partir du master local, avant de la restaurer dans le même état que o/master",ko:"로컬 저장소의 master 브랜치로부터 feature 브랜치를 만드세요. 그리고 o/master와 같아질 수 있도록 로컬 저장소의 master 브랜치를 reset 하세요.",es_AR:"Crea la rama feature desde la rama master en local antes de restablecerlo para que sea el mismo que la rama master de origen"},name:{en_US:"Locked Master",de_DE:"Gesperrter Master-Branch",ru_RU:"Заблокированная ветвь master",zh_CN:"锁定的Master(Locked Master)",es_ES:"Master bloqueado",fr_FR:"Master verrouillé",ko:"잠겨버린 Master",es_AR:"Master bloqueado"},startDialog:{en_US:{childViews:[{type:"ModalAlert",options:{markdowns:["## Remote Rejected!","","If you work on a large collaborative team its likely that master is locked and requires some Pull Request process to merge changes. If you commit directly to master locally and try pushing you will be greeted with a message similar to this:","","```"," ! [remote rejected] master -> master (TF402455: Pushes to this branch are not permitted; you must use a pull request to update this branch.)","```"]}},{type:"ModalAlert",options:{markdowns:["## Why was it rejected?","","The remote rejected the push of commits directly to master because of the policy on master requiring pull requests to instead be used.","","You meant to follow the process creating a branch then pushing that branch and doing a pull request, but you forgot and committed directly to master. Now you are stuck and cannot push your changes."]}},{type:"ModalAlert",options:{markdowns:["## The solution","","Create another branch called feature and push that to the remote. Also reset your master back to be in sync with the remote otherwise you may have issues next time you do a pull and someone else's commit conflicts with yours."]}}]},de_DE:{childViews:[{type:"ModalAlert",options:{markdowns:["## Gesperrter Master-Branch","","Wenn du in einem großen Team zusammen arbeitest, ist der Master-Branch mit hoher Wahrscheinlichkeit für direkte Änderungen gesperrt. Um Änderungen am Remote-Branch einpflegen zu können, ist ein Pull-Request-Prozess notwendig. Wenn du lokal in deinem Master-Branch einen Commit durchführst und diesen versuchst auf den serverseitigen Master-Branch zu pushen, wirst du folgende Fehlermeldung bekommen:","","```"," ! [remote rejected] master -> master (TF402455: Pushes to this branch are not permitted; you must use a pull request to update this branch.)","```"]}},{type:"ModalAlert",options:{markdowns:["## Wieso wurde diese Aktion zurückgewiesen?","","Auf Grund der serverseitig voreingestellten Richtlinien sind direkte Änderungen am Master-Branch nicht erlaubt, und erfordert einen Pull-Request.","","Um die eigenen lokalen Änderungen in den Master-Branch einbringen zu können, ist es erforderlich einen lokalen Feature-Branch zu erstellen. Dieser Feature-Branch muss dann auf den Server hochgeladen werden, damit dann ein Pull-Request eingeleitet werden kann. Dies wurde vorher durch den direkten Push des Master-Branch nicht berücksichtigt, weswegen man die Änderungen nicht hochladen konnte."]}},{type:"ModalAlert",options:{markdowns:["## Die Lösung","","Erstelle einen Branch der feature heißt und pushe diesen auf den Server. Setze den lokalen Master-Branch zurück, dass er mit dem Origin-Master-Branch synchron ist. Dies könnte sonst später zu weiteren Komplikationen führen, wenn weiter pulls durchgeführt und Commits von anderen mit deinen in Konflikt stehen."]}}]},zh_CN:{childViews:[{type:"ModalAlert",options:{markdowns:["## 远程服务器拒绝!(Remote Rejected)","","如果你是在一个大的合作团队中工作, 很可能是master被锁定了, 需要一些Pull Request流程来合并修改。如果你直接提交(commit)到本地master, 然后试图推送(push)修改, 你将会收到这样类似的信息:","","```"," ! [远程服务器拒绝] master -> master (TF402455: 不允许推送(push)这个分支; 你必须使用pull request来更新这个分支.)","```"]}},{type:"ModalAlert",options:{markdowns:["## 为什么会被拒绝?","","远程服务器拒绝直接推送(push)提交到master, 因为策略配置要求 pull requests 来提交更新.","","你应该按照流程,新建一个分支, 推送(push)这个分支并申请pull request,但是你忘记并直接提交给了master.现在你卡住并且无法推送你的更新."]}},{type:"ModalAlert",options:{markdowns:["## 解决办法","","新建一个分支feature, 推送到远程服务器. 然后reset你的master分支和远程服务器保持一致, 否则下次你pull并且他人的提交和你冲突的时候就会有问题."]}}]},ru_RU:{childViews:[{type:"ModalAlert",options:{markdowns:["## Remote Rejected!","","Когда вы работаете в составе большой команды разработчиков над проектом, то, вероятнее всего, ветвь `master` будет _заблокирована_. Для внесения изменений в неё в git существует понятие запроса на слияние `Pull Request`. В такой ситуации если вы закоммитите свои наработки непосредственно в `master` ветвь, а после выполните `git push`, то будет сгенерировано сообщение об ошибке:","","```"," ! [remote rejected] master -> master (TF402455: Pushes to this branch are not permitted; you must use a pull request to update this branch.)","```","","```"," ! [удалённо отклонено] master -> master (TF402455: Изменение этой ветви запрещены; вы можете использовать pull request для обновления этой ветви.)","```"]}},{type:"ModalAlert",options:{markdowns:["## Почему произошло отклонение моих изменений?","","Удалённый репозиторий отклонил загруженные коммиты непосредственно в `master` ветку потому, что на `master` _настроена политика_, которая требует использование `Pull request` вместо обычного `git push`.","","Эта политика подразумевает процесс создания новой ветви разработки, внесение в неё всех необходимых коммитов, загрузка изменений в удалённый репозиторий и _открытие нового_ `Pull request`. Однако вы забыли про это и закоммитили наработки непосредственно в `master` ветвь. Теперь вы застряли и не можете запушить свои изменения :(. "]}},{type:"ModalAlert",options:{markdowns:["## Решение:","","Создайте ещё одну ветвь под названием `feature` и отправьте изменения на удалённый репозиторий. Так же не забудьте вернуть вашу локальную `master` ветвь в исходное состояние (чтобы она была синхронизирована с удалённой). В противном случае у вас могут возникнуть проблемы при следующем выполнении `git pull`."]}}]},es_ES:{childViews:[{type:"ModalAlert",options:{markdowns:["## Remote Rejected!","","Si trabajas en un equipo colaborativo, es probable que la rama `master` esté bloqueada y requiera algún proceso de `Pull Request` para poder `mergear` los cambios. Si haces `commit` directamente a `master` e intentas realizar `push`, recibirás un mensaje similar a este:","","```"," ! [remote rejected] master -> master (TF402455: Pushes to this branch are not permitted; you must use a pull request to update this branch.)","```"]}},{type:"ModalAlert",options:{markdowns:["## ¿Por qué fue rechazado?","","Se rechazó el `push` del `commit` a la rama `master` debido a la política en la rama `master` que requiere el uso de `Pull Requests`.","","Trataste de crear una rama y luego hacer `pushs` creando un `Pull Request`, pero te olvidaste e hiciste `commit` directamente a `master`. Ahora estás atascado y no puedes hacer `push` de tus cambios."]}},{type:"ModalAlert",options:{markdowns:["## La solución","","Crea otra rama llamada `feature` y haz `push` a remoto. También restablece su rama `master` nuevamente para que esté sincronizado con el repositorio remoto; de lo contrario, puedes tener problemas la próxima vez que realices un `pull` y el `commit` de otra persona entre en conflicto con el tuyo."]}}]},fr_FR:{childViews:[{type:"ModalAlert",options:{markdowns:["## Remote Rejected!","","Si vous travaillez dans une équipe de grande taille, il est probable que `master` soit verrouillée, et que le mécanisme de `Pull Request` soit nécessaire pour `merge` des changements. Si vous faites un `commit` directement sur le master local, et essayez de `push`, vous serez reçu avec un message de la sorte :","","```"," ! [remote rejected] master -> master (TF402455: Pushes to this branch are not permitted; you must use a pull request to update this branch.)","```"]}},{type:"ModalAlert",options:{markdowns:["## Pourquoi est-ce rejeté?","","Le dépôt distant a rejeté le `push` de `commit` directement sur `master`, à cause de la stratégie mise en place sur `master`, imposant plutôt l'usage des `pull requests`.","","Vous étiez censé suivre le processus suivant : créer une branche, `push`, et faire une `pull request`. Mais vous avez oublié et avez fait un `commit` directement sur `master`. Maintenant vous êtes coincé et ne pouvez pas faire un `push` de vos modifications."]}},{type:"ModalAlert",options:{markdowns:["## La solution","","Créer une autre branche appelée feature, et poussez la sur le serveur distant. Réinitialisez (`reset`) également votre `master` pour être en cohérence avec l'état du serveur distant, sinon vous pourriez avoir des problèmes la prochaine fois que vous faites un `pull`, et que quelqu'un d'autre `commit` des choses en conflit avec vos modifications."]}}]},ko:{childViews:[{type:"ModalAlert",options:{markdowns:["## 원격저장소 거부! (Remote Rejected!)","","규모가 큰 개발팀에서 일하는 경우, 보통 원격저장소의 `master` 브랜치는 잠겨있습니다(locked). 그래서 변경사항을 적용하려면 pull request 과정을 거쳐야하죠. 만약에 여러분이 로컬 저장소의 `master`브랜치에서 커밋을 한 후 `push`하려고 시도한다면, 다음과 같은 오류를 받게 될겁니다. :","","```"," ! [remote rejected] master -> master (TF402455: Pushes to this branch are not permitted; you must use a pull request to update this branch.)","```"]}},{type:"ModalAlert",options:{markdowns:["## 왜 거부됐나요?","","원격 저장소는 자신의 `master` 브랜치에 대한 직접적인 커밋을 제한합니다. 왜냐하면 `push` 대신에 pull request가 쓰여야 한다는 규칙이 원격 저장소의 `master` 브랜치에는 적용되어 있기 때문이죠.","","여러분은 브랜치를 따로 만들어 작업한 다음, 그것을 `push`하고 pull request를 하려 했습니다. 하지만 그걸 잊고 실수로 `master` 브랜치에서 직접 커밋을 해버렸네요! 이제 변경 사항을 `push` 하지도 못하고 옴짝달싹 못하는 상황이 되어버렸습니다."]}},{type:"ModalAlert",options:{markdowns:["## 해결책","","`feature` 라는 이름의 다른 브랜치를 만들어 원격 저장소에 `push` 하세요. 그리고 원격 저장소와 동기화될 수 있도록 로컬 저장소의 `master` 브랜치를 `reset`하세요. 그렇지 않으면 여러분이 다음에 `pull`을 시도할 때 문제가 발생하거나, 다른 협업자들의 커밋이 여러분의 커밋과 충돌할 수도 있습니다."]}}]},es_AR:{childViews:[{type:"ModalAlert",options:{markdowns:["## Remote Rejected!","","Si trabajas en un equipo colaborativo, es probable que la rama `master` esté bloqueada y requiera algún proceso de `Pull Request` para poder `mergear` los cambios. Si haces `commit` directamente a `master` e intentas realizar `push`, recibirás un mensaje similar a este:","","```"," ! [remote rejected] master -> master (TF402455: Pushes to this branch are not permitted; you must use a pull request to update this branch.)","```"]}},{type:"ModalAlert",options:{markdowns:["## ¿Por qué fue rechazado?","","Se rechazó el `push` del `commit` a la rama `master` debido a la política en la rama `master` que requiere el uso de `Pull Requests`.","","Trataste de crear una rama y luego hacer `pushs` creando un `Pull Request`, pero te olvidaste e hiciste `commit` directamente a `master`. Ahora estás atascado y no puedes hacer `push` de tus cambios."]}},{type:"ModalAlert",options:{markdowns:["## La solución","","Crea otra rama llamada `feature` y haz `push` a remoto. También restablece su rama `master` nuevamente para que esté sincronizado con el repositorio remoto; de lo contrario, puedes tener problemas la próxima vez que realices un `pull` y el `commit` de otra persona entre en conflicto con el tuyo."]}}]}}}},{}],137:[function(e,t,o){o.level={goalTreeString:'{"branches":{"master":{"target":"C11","id":"master","remoteTrackingBranchID":"o/master","localBranchesThatTrackThis":null},"o/master":{"target":"C11","id":"o/master","remoteTrackingBranchID":null,"localBranchesThatTrackThis":["master"]},"side1":{"target":"C2","id":"side1","remoteTrackingBranchID":null,"localBranchesThatTrackThis":null},"side2":{"target":"C4","id":"side2","remoteTrackingBranchID":null,"localBranchesThatTrackThis":null},"side3":{"target":"C7","id":"side3","remoteTrackingBranchID":null,"localBranchesThatTrackThis":null}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"},"C2":{"parents":["C1"],"id":"C2"},"C3":{"parents":["C1"],"id":"C3"},"C4":{"parents":["C3"],"id":"C4"},"C5":{"parents":["C1"],"id":"C5"},"C6":{"parents":["C5"],"id":"C6"},"C7":{"parents":["C6"],"id":"C7"},"C8":{"parents":["C1"],"id":"C8"},"C9":{"parents":["C2","C8"],"id":"C9"},"C10":{"parents":["C4","C9"],"id":"C10"},"C11":{"parents":["C10","C7"],"id":"C11"}},"HEAD":{"target":"master","id":"HEAD"},"originTree":{"branches":{"master":{"target":"C11","id":"master","remoteTrackingBranchID":null,"localBranchesThatTrackThis":null}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"},"C8":{"parents":["C1"],"id":"C8"},"C5":{"parents":["C1"],"id":"C5"},"C3":{"parents":["C1"],"id":"C3"},"C2":{"parents":["C1"],"id":"C2"},"C6":{"parents":["C5"],"id":"C6"},"C4":{"parents":["C3"],"id":"C4"},"C9":{"parents":["C2","C8"],"id":"C9"},"C7":{"parents":["C6"],"id":"C7"},"C10":{"parents":["C4","C9"],"id":"C10"},"C11":{"parents":["C10","C7"],"id":"C11"}},"HEAD":{"target":"master","id":"HEAD"}}}',solutionCommand:"git checkout master;git pull;git merge side1;git merge side2;git merge side3;git push",startTree:'{"branches":{"master":{"target":"C1","id":"master","remoteTrackingBranchID":"o/master","localBranchesThatTrackThis":null},"o/master":{"target":"C1","id":"o/master","remoteTrackingBranchID":null,"localBranchesThatTrackThis":["master"]},"side1":{"target":"C2","id":"side1","remoteTrackingBranchID":null,"localBranchesThatTrackThis":null},"side2":{"target":"C4","id":"side2","remoteTrackingBranchID":null,"localBranchesThatTrackThis":null},"side3":{"target":"C7","id":"side3","remoteTrackingBranchID":null,"localBranchesThatTrackThis":null}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"},"C2":{"parents":["C1"],"id":"C2"},"C3":{"parents":["C1"],"id":"C3"},"C4":{"parents":["C3"],"id":"C4"},"C5":{"parents":["C1"],"id":"C5"},"C6":{"parents":["C5"],"id":"C6"},"C7":{"parents":["C6"],"id":"C7"}},"HEAD":{"target":"side3","id":"HEAD"},"originTree":{"branches":{"master":{"target":"C8","id":"master","remoteTrackingBranchID":null,"localBranchesThatTrackThis":null}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"},"C8":{"parents":["C1"],"id":"C8"}},"HEAD":{"target":"master","id":"HEAD"}}}',name:{en_US:"Merging with remotes",zh_CN:"合并远程仓库",zh_TW:"merge with remotes",es_AR:"Mergeando con los remotos",es_ES:"Haciendo merge con los remotos",pt_BR:"Merge com remotos",gl:"Merge cos repos remotos",de_DE:"Änderungen vom Remote zusammenführen",ja:"リモートとのmerge",fr_FR:"Fusionner avec les branches distantes",ru_RU:"Слияние с удалённым репозиторием",ko:"원격 작업과 merge하기",uk:"Мердж з віддаленим репозиторієм",vi:"Hợp nhất nhánh từ xa"},hint:{en_US:"Pay attention to the goal tree!",zh_CN:"注意目标树!",zh_TW:"注意最後要完成的目標！",es_AR:"¡Prestá atención al árbol final!",es_ES:"¡Presta atención al árbol final!",pt_BR:"Preste atenção na árvore do objetivo!",gl:"Presta atención á arbore final!",de_DE:"Beachte den Ziel-Baum!",ja:"ゴールツリーをよく見てください！",fr_FR:"Respectez l'arbre représentant l'objectif !",ru_RU:"Внимательно посмотрите на цель уровня!",ko:"goal을 잘 살펴보세요!",uk:"Уважно подивись як має виглядати результат!",vi:"Hãy để ý đến cây mục tiêu!"},compareOnlyMaster:!0,startDialog:{en_US:{childViews:[{type:"ModalAlert",options:{markdowns:["## Why not merge?","","In order to push new updates to the remote, all you need to do is *incorporate* the latest changes from the remote. That means you can either rebase *or* merge in the remote branch (e.g. `o/master`).","","So if you can do either method, why have the lessons focused on rebasing so far? Why is there no love for `merge` when working with remotes?",""]}},{type:"ModalAlert",options:{markdowns:["There's a lot of debate about the tradeoffs between merging and rebasing in the development community. Here are the general pros / cons of rebasing:","","Pros:","","* Rebasing makes your commit tree look very clean since everything is in a straight line","","Cons:","","* Rebasing modifies the (apparent) history of the commit tree.","","For example, commit `C1` can be rebased *past* `C3`. It then appears that the work for `C1'` came after `C3` when in reality it was completed beforehand.","","Some developers love to preserve history and thus prefer merging. Others (like myself) prefer having a clean commit tree and prefer rebasing. It all comes down to preferences :D"]}},{type:"ModalAlert",options:{markdowns:["For this level, let's try to solve the previous level but with *merging* instead. It may get a bit hairy but it illustrates the point well."]}}]},fr_FR:{childViews:[{type:"ModalAlert",options:{markdowns:["## Pourquoi pas merge ?","","Dans le but d'envoyer de nouvelles modifications sur le dépôt distant, la seule étape préliminaire est *d'incorporer* les derniers changements de ce dépôt dans le nôtre. Concrètement, vous pouvez faire un rebase *ou* un merge de la branche distante (c'est à dire de `o/master`).","","Donc si l'on peut faire les deux méthodes, pourquoi les leçons se sont-elles concentrées sur rebase jusqu'à présent ? Pourquoi préfère-t-on souvent éviter `merge` lorsque l'on travaille avec les branches distantes ?",""]}},{type:"ModalAlert",options:{markdowns:["Au sein de la communauté des développeurs, il y a beaucoup de débats à propos des avantages et inconvénients de l'utilisation de merge ou de rebase. Voici les principaux arguments pour et contre rebase:","","Pour :","","* Rebase rend votre arbre de commits très propre puisqu'il ressemble à une ligne droite.","","Contre :","","* Rebase modifie l'historique (apparent) de l'arbre des commits.","","Par exemple, le commit `C1` peut être rebasé *après* `C3`. Cela fait croire que le travail de `C1'` est arrivé après `C3` alors qu'en réalité il était achevé et commité avant.","","Certains développeurs aiment préserver l'historique et préfèrent donc merge. Les autres (comme moi) préfèrent avoir un arbre des commits propre et préfèrent rebase. C'est une question de goût :D"]}},{type:"ModalAlert",options:{markdowns:["Pour ce niveau, essayons de résoudre la même situation qu'au niveau précédent, mais cette fois en utilisant *merge*. Cela peut être un peu périlleux mais cela illustre bien le problème."]}}]},es_AR:{childViews:[{type:"ModalAlert",options:{markdowns:["## ¿Por qué no mergear?","","Para pushear tus novedades al remoto, todo lo que tenés que hacer es *integrar* los últimos cambios del remoto con los tuyos. Eso significa que podés hacer tanto rebase como merge con la rama remota (por ejemplo, `o/master`).","","Así que si podés hacer cualquiera de las dos, ¿por qué las lecciones sólo se centraron en rebasear hasta ahora? ¿Por qué no dedicarle algo de amor al `merge` cuando trabajamos con remotos?",""]}},{type:"ModalAlert",options:{markdowns:["Hay mucho debate entre los desarrolladores sobre los pros y contras de mergear vs rebasear. Acá tenemos los pros y contras de rebasear:","","Pros:","","* Rebasear hace que tu árbol de commits se vea bastante limpio, porque todos los commits siguen una única línea","","Contras:","","* Rebasear modifica la historia (aparente) de tu árbol de commits.","","Por ejemplo, el commit `C1` puede rebasearse para que aparezca *después* de `C3`. Entonces, parece que el trabajo de `C1'` se hizo después de `C3`, cuando en realizad se había hecho antes.","","Algunos desarrolladores aman preservar la historia, por lo que prefieren mergear. Otros (como yo) preferimos tener un árbol de commits limpios, y preferimos rebasear. Todo es una cuestión de preferencias :D"]}},{type:"ModalAlert",options:{markdowns:["Para este nivel, tratemos de resolver el nivel anterior, pero *mergeando*. Puede ponerse un poco oscuro, pero ilustra la idea bastante bien."]}}]},es_ES:{childViews:[{type:"ModalAlert",options:{markdowns:["## ¿Por qué no hacer merge?","","Para hacer push con tus novedades al remoto, todo lo que tienes que hacer es *integrar* los últimos cambios del remoto con los tuyos. Eso significa que puedes hacer tanto rebase como merge con la rama remota (por ejemplo, `o/master`).","","Así que si puedes hacer cualquiera de las dos, ¿por qué las lecciones sólo se han centrado en rebasear hasta ahora? ¿Por qué no dedicarle algo de amor al `merge` cuando trabajamos con remotos?",""]}},{type:"ModalAlert",options:{markdowns:["Hay mucho debate entre los desarrolladores sobre los pros y contras de mergear vs rebasear. Aquí te mostraré los pros y contras de rebasear:","","Pros:","","* Rebasear hace que tu árbol de commits se vea bastante limpio, porque todos los commits siguen una única línea","","Contras:","","* Rebasear modifica la historia (aparente) de tu árbol de commits.","","Por ejemplo, el commit `C1` puede rebasearse para que aparezca *después* de `C3`. Entonces, parece que el trabajo de `C1'` se hizo después de `C3`, cuando en realizad se había hecho antes.","","Algunos desarrolladores prefieren preservar la historia, por lo que deciden mergear. Otros (como yo) preferimos tener un árbol de commits limpios, y preferimos rebasear. Todo es una cuestión de preferencias :D"]}},{type:"ModalAlert",options:{markdowns:["Para este nivel, tratemos de resolver el nivel anterior, pero *mergeando*. Puede volverse un poco cuesta arriba, pero ilustra la idea bastante bien."]}}]},pt_BR:{childViews:[{type:"ModalAlert",options:{markdowns:["## Por que não um merge?","","Para enviar novas atualizações ao repositório remoto, tudo que você precisa é *incorporar* as últimas mudanças ali presentes. Isso significa que você pode tanto fazer um rebase *quanto* um merge no ramo remoto (ex. `o/master`).","","Então, se você pode escolher qualquer um desses métodos, por que as lições focaram no rebase até o momento? Por que não demos nenhum amor ao `merge` quando trabalhamos com repositórios remotos?",""]}},{type:"ModalAlert",options:{markdowns:["Há muito debate na comunidade de desenvolvedores sobre as vantagens e desvantagens do merge e do rebase. Aqui estão os prós e contras gerais do rebase:","","Prós:","","* O rebase faz a sua árvore de commits parecer bastante limpa, já que tudo fica em uma linha reta","","Contras:","","* O rebase modifica o histórico *aparente* da sua árvore de commits.","","Por exemplo, o commit `C1` pode aparecer *depois do* `C3` após sofrer rebase. Então, fica parecendo que alguém trabalhou em `C1` apenas depois de `C3` estar completo, quando na realidade o que ocorreu foi o contrário.","","Alguns desenvolvedores adoram preservar o histórico e, portanto, preferem o merge. Outros (como eu) preferem ter uma árvore de commits limpa, obtida usando rebase. Tudo se resume ao gosto pessoal :D"]}},{type:"ModalAlert",options:{markdowns:["Para este nível, tente resolver o mesmo problema do nível anterior, mas usando *merge* em vez de rebase. A árvore pode ficar um pouco cabeluda, mas isso ilustra bem o nosso ponto."]}}]},gl:{childViews:[{type:"ModalAlert",options:{markdowns:["## ¿Por qué non mesturar?","","Para empurrar as túas novidades ó remoto, todo o que tes que facer é *integrar* os últimos cambios do remoto cos teus. Eso significa que podes facer tanto rebase como merge ca rama remota (por exemplo, `o/master`).","","Así que podes facer calquera das dúas, ¿por qué as leccións só se centraron en rebasar ata agora? ¿Por qué non adicarlle algo de amor ó `merge` cando traballamos con remotos?",""]}},{type:"ModalAlert",options:{markdowns:["Hai moito debate entre os desenvolvedores sobre os pros e contras de mesturar vs rebasar. Aquí temos os pros e os contras de rebasar:","","Pros:","","* Rebasar fai que a túa árbore de commits sexa bastante limpa, xa que tódolos commits seguen unha única línea.","","Contras:","","* Rebasar modifica a historia (aparente) da túa árbore de commits.","","Por exemplo, o commit `C1` pode rebasarse para que apareza *despois* de `C3`. Entón, parece que o traballo de `C1'` fíxose despois de `C3`, inda que na realidade fixérase antes.","","Algúns desenvolvedores  aman preservar a historia, polo que prefiren mesturar. Outros (coma min) preferimos ter unha árbore de commits limpos, e preferimos rebasar. Todo é unha cuestión de preferencias :D"]}},{type:"ModalAlert",options:{markdowns:["Para este nivel, tratemos de resolvelo nivel anterior, pero *mesturando*. Pode poñerse un pouco oscuro, pero ilustra a idea bastante ben."]}}]},zh_TW:{childViews:[{type:"ModalAlert",options:{markdowns:["## 為何不要 merge？","","為了要 push 新的 commit 給 remote，你只需要做的是先同步 remote 的更新，那就表示你可以使用 rebase *或者*是 merge remote branch （例如，`o/master`）。","","所以假如你已經學會使用其中一個方式了，那為什麼我們到目前為止還在強調 `rebase`？為什麼當提到 remote 的時候，反而 `merge` 比較沒有受到關注？",""]}},{type:"ModalAlert",options:{markdowns:["在程式發展的社群中，關於 `merge` 以及 `rebase` 的孰優孰劣有很多的爭論。這裡我們會提到關於 `rebase` 的優點及缺點：","","優點：","","* `rebase` 使得你的 commit tree 看起來更為簡潔，因為任何的 commit 都在一條直線上面。","","缺點：","","* `rebase` 修改了 commit tree 的歷史紀錄。","","舉例來說，我們可以 rebase commit `C1`，將 `C1` 接在*過去的* `C3` 上面，那麼就可以表現出 `C1` 是出現在 `C3` 的後面。","","有一些程式設計師喜歡保留歷史紀錄，因此他們會比較喜歡 `merge`; 其他人（例如我自己）比較喜歡一個簡潔的 commit tree，因此他們比較喜歡 `rebase`。這些都是擇你所愛。:D"]}},{type:"ModalAlert",options:{markdowns:["在這個關卡中，我們面對的是之前關卡的題目，但是我們採用的是 `merge`，這可能會讓你感覺到有點困難，但是確實有講到重點。"]}}]},de_DE:{childViews:[{type:"ModalAlert",options:{markdowns:["## Warum nicht Merge?","","Um neue Dinge auf das Remote zu schieben musst du erst alle Änderungen vom Remote holen und bei dir integrieren. Das bedeutet du kannst den entfernten Branch (z.B. `o/master`) entweder Rebasen *oder* Mergen.","","Wenn du also beide Methoden benutzen kannst, warum haben sich die Level bisher auf Rebase konzentriert? Warum mag keiner `merge` wenn es um Remotes geht?",""]}},{type:"ModalAlert",options:{markdowns:["Es gibt eine Menge Diskussionen unter Entwicklern über die Vor- und Nachteile beim Mergen und Rebasen. Hier ein paar Vor- und Nachteile zum Rebasen:","","Vorteile:","","* Rebasen macht den Commit-Baum sehr übersichtlich, weil alles linear aufeinander aufbaut","","Nachteile:","","* Rebasen verändert die History eines Branches.","","Zum Beispiel kann durch Rebasen Commit `C1` an Commit `C3` *vorbei* bewegt werden, bzw. eine Kopie von `C1`. Es sieht dann so aus als wären die Änderungen in `C1` nach denen in `C3` gemacht worden, obwohl das nicht stimmt.","","Manche Entwickler möchten lieber die History lassen wie sie ist und ziehen daher das Mergen vor. Andere (wie ich) haben lieber einen sauberen Commit-Baum und ziehen Rebase vor. Am Ende ist es eine Geschmacksfrage. :D"]}},{type:"ModalAlert",options:{markdowns:["In diesem Level wollen wir versuchen die Aufgabe vom letzten Level erneut zu lösen, aber diesmal mit einem *Merge*. Das wird vielleicht etwas haariger, stellt aber gut die Implikationen dar."]}}]},zh_CN:{childViews:[{type:"ModalAlert",options:{markdowns:["## 为什么不用 merge 呢?","","为了 push 新变更到远程仓库，你要做的就是**包含**远程仓库中最新变更。意思就是只要你的本地分支包含了远程分支（如 `o/master`）中的最新变更就可以了，至于具体是用 rebase 还是 merge，并没有限制。","","那么既然没有规定限制，为何前面几节都在着重于 rebase 呢？为什么在操作远程分支时不喜欢用 `merge` 呢？",""]}},{type:"ModalAlert",options:{markdowns:["在开发社区里，有许多关于 merge 与 rebase 的讨论。以下是关于 rebase 的优缺点：","","优点:","","* Rebase 使你的提交树变得很干净, 所有的提交都在一条线上","","缺点:","","* Rebase 修改了提交树的历史","","比如, 提交 C1 可以被 rebase 到 C3 之后。这看起来 C1 中的工作是在 C3 之后进行的，但实际上是在 C3 之前。","","一些开发人员喜欢保留提交历史，因此更偏爱 merge。而其他人（比如我自己）可能更喜欢干净的提交树，于是偏爱 rebase。仁者见仁，智者见智。 :D"]}},{type:"ModalAlert",options:{markdowns:["本关，我们还是解决上一关卡中的问题，但是要用 merge 替换 rebase。这显然有点画蛇添足，但这只是为了更好的说明上面的观点。"]}}]},ja:{childViews:[{type:"ModalAlert",options:{markdowns:["## なぜマージではいけないのか？","","新しい更新をリモートにプッシュするため、あなたがする必要があるのはリモートからの最近の変更の*組み込み*です。それは、リモートブランチ(例えば、`o/master`)にリベース*か*マージのどちらかをあなたがする必要があるということを意味します。","","もしどっちの方法でも行うことができるなら、なぜこれまでのレッスンでは、リベースに焦点を当ててきたのでしょう？リモートへの作業で、なぜ`merge`を推してこなかったのでしょうか？",""]}},{type:"ModalAlert",options:{markdowns:["開発コミュニティで、マージとリベースの間でのトレードオフについては多くの議論がなされています。ここでは一般的なリベースのメリット/デメリットを紹介しましょう:","","メリット:","","* リベースは全てが直線上にあるので、あなたのコミットツリーをとても綺麗にみせます。","","デメリット:","","* リベースは、コミットツリーの（見ため上の）履歴を改変してしまいます。","","例えば、`C1`コミットは*過去*の`C3`コミットにリベースすることができます。それは、実際には前に完了しているのにもかかわらず、`C1'`の作業がまるで`C3`の後に行われたものであるかのように見えるようになります。","","幾人かの開発者は、履歴をそのまま保持するのが好みで、マージを選択します。その他（例えば私は）きれいなコミットツリーを好むのでリベースを選択します。つまるところ、好みの問題というわけですね :D"]}},{type:"ModalAlert",options:{markdowns:["このレベルでは、前回のレベルを*マージ*を代わりに使って解いてみてください。ちょっと難しいかもしれませんが、このレッスンのポイントを把握するのに十分な知見を得られるはずです。"]}}]},ru_RU:{childViews:[{type:"ModalAlert",options:{markdowns:["## Merge? Нет, нет, спасибо.","","Чтобы закачать (push) новые изменения в удалённый репозиторий, всё, что вам нужно сделать - это *смешать* последние изменения из удалённого репозитория. Это значит, что вы можете выполнить rebase *или* merge на удалённом репозитории (например, `o/master`).","","Если мы можем воспользоваться одним из двух методов, то почему же эти упражнения сфокусированы в основном на rebase? К чему такая нелюбовь к `merge`, когда речь идёт о работе с удалёнными репозиториями?",""]}},{type:"ModalAlert",options:{markdowns:["В среде разработчиков существует огромное количество дебатов около merging и rebasing. Ниже приведены основные за / против метода rebasing:","","За:","","* Rebasing делает дерево коммитов более чистым и читабельным, потому что всё представляется единой прямой линией.","","Против:","","* Метод rebasing явно изменяет историю коммитов в дереве.","","Например, коммит `C1` может быть перебазирован *после* `C3`. Соответственно, в дереве работа над `C1'` будет отображаться как идущая после `C3`, хотя на самом деле она была выполнена раньше.","","Некоторые разработчики любят сохранять историю и предпочитают слияние (merging). Другие (такие как я) предпочитают иметь чистое дерево коммитов, и пользуются перебазировкой (rebasing). Всё зависит от ваших предпочтений и вкусов :D"]}},{type:"ModalAlert",options:{markdowns:["Чтобы пройти этот уровень, решите предыдущие задачи, но с помощью *слияния (merging)*. Может быть, получится слегка неказисто, однако такое упражнение хорошо отразит суть различий."]}}]},ko:{childViews:[{type:"ModalAlert",options:{markdowns:["## 왜 merge하지 않는거죠?","","새로운 작업들을 원격 저장소로 push하기위해서 여러분은 원격 저장소의 최근 변경들을 *합치기*만 하면 됩니다. 이 말은 즉 원격 브랜치로(예:`o/master`) rebase를 할 수도 merge를 할 수도 있다는 것입니다.","","두가지를 다 할 수 있다면, 왜 지금까지 배운 레슨들은 rebase를 하는것에 집중한거죠? 원격 저장소와 작업을 할때는 왜 `merge`에게 관심을 가져주지 않는건가요?",""]}},{type:"ModalAlert",options:{markdowns:["개발 커뮤니티에서 merge를 하는것과 rebase 사이의 트레이드 오프에 대해 많은 논의가 이루어지고 있습니다. 여기 rebase의 일반적인 장 / 단점을 소개하겠습니다:","","장점:","","* rebase는 여러분의 커밋 트리를 깔끔하게 정리해서 보기가 좋습니다 모든게 한 줄에 있기때문이죠.","","단점:","","* rebase를 하게 되면 커밋 트리의 (보이는)히스토리를 수정합니다.","","예를 들어, 커밋 `C1`는 *과거*의`C3`로 rebase 될 수 있습니다. `C1'`의 작업이 `C3`의 다음에 있는것으로 보이게 되는겁니다. 실제로는 `C1`이 먼저 완료된거인데 말이죠.","","어떤 개발자들은 이력이 보존되는것을 좋아하기 때문에 merge를 선호합니다. 그 이외는(저 처럼) 커밋 트리가 깔끔한것을 선호해서 rebase를 선호합니다. 자기 입맛에 맞추면 되겠습니다 :D"]}},{type:"ModalAlert",options:{markdowns:["이번 레벨에서는 이전의 레벨을 해결 해봅시다. 대신 이번에는 *merge*를 사용하겠습니다. 조금 복잡할 수 있지만 지금 배운 내용의 포인트를 파악하기 좋을것 입니다."]}}]},uk:{childViews:[{type:"ModalAlert",options:{markdowns:["## Чому б не змерджити?","","Для того, щоб віддалений сервер прийняв твої зміни, треба *об'єднати* їх з останніми змінами на сервері. Це означає ребейс *або* мердж з віддаленою гілкою (напр. `o/master`).","","Хмм, якщо можна використати один із цих методів, для чого нам додаткові уроки про ребейс? Чому ніхто не любить `merge`, працюючи з віддаленим сервером?",""]}},{type:"ModalAlert",options:{markdowns:["В спільноті розробників давно ведуться суперечки щодо переваг і недоліків мерджингу і ребейсу. Ось головні з них для ребейсу:","","За:","","* Ребейс дозволяє тримати дерево комітів чистим, оскільки все вибудовується в пряму лінію;","","Проти:","","* Ребейс змінює історію в дереві комітів.","","Наприклад, коміт `C1` можна ребейснути *на* `C3`. Як результат `C1'` буде йти після `C3`, хоча насправді його зробили раніше.","","Деякі розробники люблять зберігати історії і тому вибирають мерджинг. Інші (як і я) воліють мати чисте дерево комітів і віддають перевагу ребейсу. Це питання смаку :D"]}},{type:"ModalAlert",options:{markdowns:["На цьому рівні спробуймо вирішити попереднє завдання з використанням *мерджу*. Можливо вийде не так охайно, але добре покаже різницю в підходах."]}}]},vi:{childViews:[{type:"ModalAlert",options:{markdowns:["## Tại sao không hợp nhất?","","Để có thể đẩy cập nhật của bạn lên kho nhánh từ xa, tất cả những gì bạn cần làm là *kết nạp* thay đổi mới nhất từ nhánh từ xa. Nghĩa là bạn có thể dùng tái bố trí *hoặc* hợp nhất với nhánh từ xa (ví dụ `o/master`).","","Vậy ta có thể sử dụng một trong 2 cách, thì tại sao đến giờ ta chỉ tập trung vào tái bố trí trong các bài học? Tại sao khi làm việc với nhánh từ xa lại ta lại không thích `hợp nhất` (`merge`)?",""]}},{type:"ModalAlert",options:{markdowns:["Trong cộng đồng phát triền phần mềm có rất nhiều tranh luận về ưu, nhươc, khuyết của việc sử dụng tái bố trí(`rebase`) hay hợp nhất(`merge`). Dưới đây là một vài ưu / nhược cơ bản của tái bố trí:","","Ưu điểm:","","* Tái bố trí làm cây commit của bạn trông gọn gàng hơn nhiều vì mọi thứ được xếp theo đường thẳng","","Nhược điểm:","","* Tái bố trí sửa đổi lịch sử (biểu hiện) của cây commit.","","Ví dụ, commit `C1` có thể bố trí lên *sau* `C3`. Thế là `C1'` biểu hiện như là nó xuất hiện sau `C3` trong khi thực tế nó được hoàn thành trước đó.","","Có những nhà phát triển muốn tôn trọng tính lịch sự nên họ ưa thích hợp nhất hơn. Những người khác (như tôi chẳng hạn) thì thiên về tái bố trí hơn vì muốn có cây commit gọn gàng. Rốt cục cũng là thiên hướng thôi :D"]}},{type:"ModalAlert",options:{markdowns:["Ở cấp độ này, hãy thử giải bài tập trước nhưng mà với *hợp nhất*. Có lẽ bài này hơi thừa nhưng mà nó mịnh họa quan điểm trên rõ ràng hơn."]}}]}}}},{}],138:[function(e,t,o){o.level={goalTreeString:'{"branches":{"master":{"target":"C4","id":"master","remoteTrackingBranchID":"o/master","localBranchesThatTrackThis":null},"o/master":{"target":"C3","id":"o/master","remoteTrackingBranchID":null,"localBranchesThatTrackThis":["master"]}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"},"C2":{"parents":["C1"],"id":"C2"},"C3":{"parents":["C1"],"id":"C3"},"C4":{"parents":["C2","C3"],"id":"C4"}},"HEAD":{"target":"master","id":"HEAD"},"originTree":{"branches":{"master":{"target":"C3","id":"master","remoteTrackingBranchID":null,"localBranchesThatTrackThis":null}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"},"C3":{"parents":["C1"],"id":"C3"}},"HEAD":{"target":"master","id":"HEAD"}}}',solutionCommand:"git pull",startTree:'{"branches":{"master":{"target":"C2","id":"master","remoteTrackingBranchID":"o/master","localBranchesThatTrackThis":null},"o/master":{"target":"C1","id":"o/master","remoteTrackingBranchID":null,"localBranchesThatTrackThis":["master"]}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"},"C2":{"parents":["C1"],"id":"C2"}},"HEAD":{"target":"master","id":"HEAD"},"originTree":{"branches":{"master":{"target":"C3","id":"master","remoteTrackingBranchID":null,"localBranchesThatTrackThis":null}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"},"C3":{"parents":["C1"],"id":"C3"}},"HEAD":{"target":"master","id":"HEAD"}}}',name:{en_US:"Git Pullin'",zh_CN:"Git Pull",zh_TW:"git pull",es_AR:"git pull",es_ES:"git pull",pt_BR:"Git Pull",gl:"Git Pull",de_DE:"Git Pull",ja:"Git Pull",fr_FR:"Git pull",ru_RU:"Git pull",uk:"Git pull",ko:"Git pull",vi:"Git pull"},hint:{en_US:"Just run git pull!",zh_CN:"运行 git pull 命令就可以了！",zh_TW:"只要下 git pull 這個指令即可",es_AR:"Simplemente ¡hacé git pull!",es_ES:"Simplemente ¡ejecuta git pull!",pt_BR:"Basta executar git pull!",gl:"Sinxelamente fai git pull!",de_DE:"Führe einfach git pull aus.",ja:"単にgit pullを実行！",fr_FR:"Utilisez facilement git pull !",ru_RU:"Запустите комманду git pull !",uk:"Просто виконай git pull !",ko:"그냥 git pull을 하세요!",vi:"Đơn giản là gõ git pull!"},startDialog:{en_US:{childViews:[{type:"ModalAlert",options:{markdowns:["## Git Pull","","Now that we've seen how to fetch data from a remote repository with `git fetch`, let's update our work to reflect those changes!","","There are actually many ways to do this -- once you have new commits available locally, you can incorporate them as if they were just normal commits on other branches. This means you could execute commands like:","","* `git cherry-pick o/master`","* `git rebase o/master`","* `git merge o/master`","* etc., etc.","","In fact, the workflow of *fetching* remote changes and then *merging* them is so common that git actually provides a command that does both at once! That command is `git pull`."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Let's first see a `fetch` and a `merge` executed sequentially"],afterMarkdowns:["Boom -- we downloaded `C3` with a `fetch` and then merged in that work with `git merge o/master`. Now our `master` branch reflects the new work from the remote (in this case, named `origin`)"],command:"git fetch; git merge o/master",beforeCommand:"git clone; git commit; git fakeTeamwork"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["What would happen if we used `git pull` instead?"],afterMarkdowns:["The same thing! That should make it very clear that `git pull` is essentially shorthand for a `git fetch` followed by a merge of whatever branch was just fetched."],command:"git pull",beforeCommand:"git clone; git commit; git fakeTeamwork"}},{type:"ModalAlert",options:{markdowns:["We will explore the details of `git pull` later (including options and arguments), but for now let's try it out in the level.","","Remember -- you can actually solve this level with just `fetch` and `merge`, but it will cost you an extra command :P"]}}]},fr_FR:{childViews:[{type:"ModalAlert",options:{markdowns:["## Git Pull","","Maintenant que vous avez vu comment rapatrier des données depuis un dépôt distant avec `git fetch`, mettons à jour notre copie de travail pour refléter ces changements !","","Il existe en fait beaucoup de façons de faire cela -- une fois que vous avez de nouveaux commits disponibles localement, vous pouvez les incorporer dans votre branche de travail comme s'ils étaient des commits normaux d'autres branches. Cela signifie que pourriez simplement exécuter des commandes comme :","","* `git cherry-pick o/master`","* `git rebase o/master`","* `git merge o/master`","* etc., etc.","","En fait, le principe de *rapatrier* (fetch) les branches distantes puis les *fusionner* (merge) est si commun que git a en réalité une commande pour faire les deux à la fois ! Cette commande est `git pull`."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Voyons d'abord un `fetch` puis un `merge` exécutés séquentiellement"],afterMarkdowns:["Boum -- nous avons téléchargé `C3` avec un `fetch` et ensuite nous avons fusionné ce travail dans notre copie avec `git merge o/master`. Maintenant notre branche `master` reflète le nouveau travail du dépôt distant (dans ce cas, nommé `origin`)"],command:"git fetch; git merge o/master",beforeCommand:"git clone; git commit; git fakeTeamwork"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Que se passerait-il si nous utilisions plutôt `git pull` ?"],afterMarkdowns:["La même chose ! Cela devrait maintenant être clair que `git pull` est surtout un raccourci pour `git fetch` suivi d'un merge de toutes les branches qui viennent d'avoir un fetch."],command:"git pull",beforeCommand:"git clone; git commit; git fakeTeamwork"}},{type:"ModalAlert",options:{markdowns:["Nous allons explorer les détails de `git pull` plus tard (y compris options et arguments), mais pour ce niveau pratiquons d'abord la technique de base.","","Rappelez-vous : vous pouvez aussi résoudre ce niveau avec `fetch` et `merge`, mais cela vous coûtera une commande supplémentaire :P"]}}]},es_AR:{childViews:[{type:"ModalAlert",options:{markdowns:["## Git Pull","","Ahora que vimos cómo traer datos de un repositorio remoto con `git fetch`, ¡actualicemos nuestro trabajo local para reflejar esos cambios!","","Realmente hay varias formas de hacer esto: una vez que tenés los commits disponibles localmente, podés integrarlos como si fueran commits comunes de otras ramas. Esto significa que podrías ejecutar comandos como:","","* `git cherry-pick o/master`","* `git rebase o/master`","* `git merge o/master`","* etc., etc.","","De hecho, el flujo de trabajo de *fetchear* cambios remotos y después *mergearlos* es tan común que git incluye un comando que hace ambas cosas de una: ¡`git pull`!"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Veamos primero un `fetch` y un `merge` ejecutados secuencialmente"],afterMarkdowns:["Boom: descargamos `C3` con un `fetch` y luego lo mergeamos con `git merge o/master`. Ahora nuestra rama `master` refleja el nuevo trabajo del remoto (en este caso, llamado `origin`)"],command:"git fetch; git merge o/master",beforeCommand:"git clone; git commit; git fakeTeamwork"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["¿Qué pasaría si usáramos `git pull` en cambio?"],afterMarkdowns:["¡Lo mismo! Eso debería dejar bien en claro que `git pull` es básicamente un atajo para hacer `git fetch` seguido por un merge con la rama que sea que hayamos bajado."],command:"git pull",beforeCommand:"git clone; git commit; git fakeTeamwork"}},{type:"ModalAlert",options:{markdowns:["Exploraremos los detalles de `git pull` después (incluyendo sus opciones y parámetros), pero por ahora probémoslo en este nivel.","","Acordate: podés resolver este comando simplemente con `fetch` y `merge`, pero eso te costaría un comando extra :P"]}}]},es_ES:{childViews:[{type:"ModalAlert",options:{markdowns:["## Git Pull","","Ahora que vimos cómo traer datos de un repositorio remoto con `git fetch`, ¡actualicemos nuestro trabajo local para reflejar esos cambios!","","Realmente hay varias formas de hacer esto: una vez que tienes los commits disponibles localmente, puedes integrarlos como si fueran commits comunes de otras ramas. Esto significa que podrías ejecutar comandos como:","","* `git cherry-pick o/master`","* `git rebase o/master`","* `git merge o/master`","* etc., etc.","","De hecho, el flujo de trabajo de *fetchear* cambios remotos y después *mergearlos* es tan común que git incluye un comando que hace ambas cosas de una: ¡`git pull`!"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Veamos primero un `fetch` y un `merge` ejecutados secuencialmente"],afterMarkdowns:["Zas: descargamos `C3` con un `fetch` y luego lo mergeamos con `git merge o/master`. Ahora nuestra rama `master` refleja el nuevo trabajo del remoto (en este caso, llamado `origin`)"],command:"git fetch; git merge o/master",beforeCommand:"git clone; git commit; git fakeTeamwork"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["¿Qué pasaría si en cambio utilizásemos `git pull`?"],afterMarkdowns:["¡Lo mismo! Eso debería dejar bien claro que `git pull` es básicamente un atajo para hacer `git fetch` seguido por un merge con la rama que hayamos descargado."],command:"git pull",beforeCommand:"git clone; git commit; git fakeTeamwork"}},{type:"ModalAlert",options:{markdowns:["Exploraremos los detalles de `git pull` después (incluyendo sus opciones y parámetros), pero por ahora probémoslo en este nivel.","","Recuerda: puedes ejecutar este comando simplemente con `fetch` y `merge`, pero eso te costaría un comando extra :P"]}}]},pt_BR:{childViews:[{type:"ModalAlert",options:{markdowns:["## Git Pull","","Agora que vimos como baixar dados de um repositório remoto com `git fetch`, vamos atualizar nosso trabalho para refletir essas mudanças!","","Há, na verdade, muitas formas de fazê-lo -- uma vez que você tenha os novos commits disponíveis localmente, você pode incorporá-los como se eles fossem commits normais em outros ramos. Isso significa que você pode executar comandos como estes a seguir:","","* `git cherry-pick o/master`","* `git rebase o/master`","* `git merge o/master`","* etc., etc.","","O fluxo de trabalho de executar *fetch* para baixar as mudanças remotas e depois fazer um *merge* delas é tão comum que o Git na verdade fornece um comando que faz ambas as coisas de uma vez só! Esse comando é o `git pull`."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Vamos primeiro ver um `fetch` e um `merge` executados sequencialmente"],afterMarkdowns:["Boom -- nós baixamos o `C3` com um `fetch` e então fizemos um merge desse trabalho usando `git merge o/master`. Agora o nosso ramo `master` reflete o trabalho realizado no repositório remoto (neste caso, chamado de `origin`)"],command:"git fetch; git merge o/master",beforeCommand:"git clone; git commit; git fakeTeamwork"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["O que iria acontecer se, em vez disso, usássemos `git pull`?"],afterMarkdowns:["Exatamente o mesmo! Isso deve tornar bem claro que `git pull` é essencialmente um caminho mais curto para executar um `git fetch` seguido de um merge de seja já qual ramo tiver sido baixado."],command:"git pull",beforeCommand:"git clone; git commit; git fakeTeamwork"}},{type:"ModalAlert",options:{markdowns:["Vamos explorar os detalhes do `git pull` mais tarde (incluindo opções e parâmetros), mas por enquanto, experimente usá-lo em sua forma mais básica.","","Lembre-se -- você também poderia resolver este nível com um `fetch` e um `merge`, mas isso lhe custaria um comando a mais :P"]}}]},gl:{childViews:[{type:"ModalAlert",options:{markdowns:["## Git Pull","","Agora que vimos cómo traer os datos dun repositorio remoto con `git fetch`, ¡actualicemos o noso traballo local para reflexar eses cambios!","","Realmente hai varias formas de facer esto: unha vez que teñas os commits dispoñibles localmente, podes integralos coma se foran commits comúns de outras ramas. Esto significa que poderías executar comandos como:","","* `git cherry-pick o/master`","* `git rebase o/master`","* `git merge o/master`","* etc., etc.","","De feito, o fluxo de traballo de *fetchear* os cambios remotos e depois *mesturalos* é tan común que git inclúe un comando que fai as dúas operacións nunha sola: ¡`giti pull`!"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Vexamos primeiro un `fetch` e un `merge` executados secuencialmente"],afterMarkdowns:["Boom: descargamos `C3` cun `fetch` e logo mesturámolos con `git merge o/master`. Agora a nosa rama `master` reflexa o novo traballo do remoto (neste caso, chamado `origin`)"],command:"git fetch; git merge o/master",beforeCommand:"git clone; git commit; git fakeTeamwork"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["¿Qué pasaría se usáramos `git pull` en cambio?"],afterMarkdowns:["¡O mesmo! Eso debía deixar ben claro que `git pull` é básicamente un atallo para facer `git fetch` seguido pola mestura ca rama que houbésemos descargado."],command:"git pull",beforeCommand:"git clone; git commit; git fakeTeamwork"}},{type:"ModalAlert",options:{markdowns:["Exploraremos os detalles de `git pull` despois (incluíndo as súas operacións e parámetros), pero por agora probarémolo neste nivel.","","Lémbrate: podes resolver este comando sinxelamente con `fetch` e `merge`, pero eso costaríache un comando extra :P"]}}]},zh_TW:{childViews:[{type:"ModalAlert",options:{markdowns:["## git pull","","現在我們已經知道如何利用 `git fetch` 從 remote 抓取 commit，讓我們來看一下如何將這些 commit 更新到我們的檔案！","","只要在你的 local 有 fetch 到新的 commit，便有很多方法可以做到這件事情，你可以把它們視為在其它 branch 上面的一般的 commit，這表示你可以執行像這樣子的指令:","","* `git cherry-pick o/master`","* `git rebase o/master`","* `git merge o/master`","* 等等‧‧‧","","事實上，一次*下載 (fetch)* remote 的更新並且*合併（merge）* 這些更新在 git 裡面是很常見的事情！這個命令叫作 `git pull`。"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["讓我們來看循序執行一個 `fetch` 和一個 `merge` 的樣子"],afterMarkdowns:["看吧! 我們利用 `fetch` 下載了 `C3` 並且利用 `git merge o/master` 來更新資料，現在我們的 `master` branch 跟 remote 同步了（在這個例子中，remote repository 叫作 `origin`）。"],command:"git fetch; git merge o/master",beforeCommand:"git clone; git commit; git fakeTeamwork"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["如果用 `git pull` 會發生什麼事情？"],afterMarkdowns:["一樣！很明顯地，`git pull` 其實就是 git fetch 跟 git merge 的循序執行的結果，而且 merge 的 branch 就是 fetch 所更新的 branch。"],command:"git pull",beforeCommand:"git clone; git commit; git fakeTeamwork"}},{type:"ModalAlert",options:{markdowns:["我們會解釋 `git pull` 的細節（包括可選擇的參數）, 但現在先讓我們在這個關卡試試看！","","記住喔，你可以利用循序執行的方式來執行 `fetch` 以及 `merge` 來完成這個關卡，但是相對於 `git pull`，你就得多打一個指令。:P"]}}]},zh_CN:{childViews:[{type:"ModalAlert",options:{markdowns:["## Git Pull","","既然我们已经知道了如何用 `git fetch` 获取远程的数据, 现在我们学习如何将这些变化更新到我们的工作当中。","","其实有很多方法的 —— 当远程分支中有新的提交时，你可以像合并本地分支那样来合并远程分支。也就是说就是你可以执行以下命令: ","","* `git cherry-pick o/master`","* `git rebase o/master`","* `git merge o/master`","* 等等","","实际上，由于先抓取更新再合并到本地分支这个流程很常用，因此 Git 提供了一个专门的命令来完成这两个操作。它就是我们要讲的 `git pull`。"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["我们先来看看 `fetch`、`merge` 依次执行的效果"],afterMarkdowns:["我们用 `fetch` 下载了 `C3`, 然后通过 `git merge o/master` 合并了这一提交记录。现在我们的 `master` 分支包含了远程仓库中的更新（在本例中远程仓库名为 `origin`）"],command:"git fetch; git merge o/master",beforeCommand:"git clone; git commit; git fakeTeamwork"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["如果使用 `git pull` 呢?"],afterMarkdowns:["同样的结果！这清楚地说明了 `git pull` 就是 git fetch 和 git merge <just-fetched-branch> 的缩写！"],command:"git pull",beforeCommand:"git clone; git commit; git fakeTeamwork"}},{type:"ModalAlert",options:{markdowns:["稍后我们会探索一下 `git pull` 的细节(包括选项和参数)，现在咱们先解决这个关卡。","","实际上你完全可以用 `fetch` 和 `merge` 通过本关，但是这会增加你的命令数。 :P"]}}]},de_DE:{childViews:[{type:"ModalAlert",options:{markdowns:["## Git Pull","","Jetzt, wo wir wissen wie wir mit `git fetch` Daten von einem entfernten Repository holen können, wollen wir unsere lokalen Daten aktualisieren, damit sie die Änderungen vom Server beinhalten.","","Tatsächlich gibt es eine Menge Wege dies zu erreichen -- sobald du die neuen Commits lokal verfügbar hast, kannst du sie integrieren so als wären es Commits von ganz normalen anderen Branches. Du kannst also:","","* `git cherry-pick o/master`","* `git rebase o/master`","* `git merge o/master`","* usw. usf. ausführen.","","Der Ablauf, die Änderungen vom Server zu holen und dann in die eigene Arbeit zu mergen wird so häufig benötigt, dass Git einen Befehl kennt der beides auf einmal erledigt! Das ist `git pull`."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Schauen wir uns erst mal ein `fetch` gefolgt von `merge` an:"],afterMarkdowns:["Bämm -- wir haben `C3` mit `fetch` heruntergeladen und dann in unseren Branch mit `git merge o/master` integriert. Nun bildet unser `master` dieselben Inhalte ab, wie sie auf dem entfernten Server (`origin`) liegen."],command:"git fetch; git merge o/master",beforeCommand:"git clone; git commit; git fakeTeamwork"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Was passiert wohl, wenn wir stattdessen `git pull` benutzen?"],afterMarkdowns:["Dasselbe in Pink. Das sollte recht deutlich machen, dass `git pull` nur eine Abkürzung für `git fetch` gefolgt von einem Merge des gerade aktualisierten Branches ist."],command:"git pull",beforeCommand:"git clone; git commit; git fakeTeamwork"}},{type:"ModalAlert",options:{markdowns:["Die Feinheiten von `git pull` werden wir uns später ansehen, für's Erste lass es uns in diesem Level ausprobieren.","","Vergiss nicht -- du kannst diesen Level auch mit `fetch` und `merge` lösen, aber das kostet dich einen Befehl extra. :P"]}}]},ru_RU:{childViews:[{type:"ModalAlert",options:{markdowns:["## Git Pull","","Теперь, когда мы познакомились с тем, как извлекать данные из удалённого репозитория с помощью `git fetch`, давайте обновим нашу работу, чтобы отобразить все эти изменения!","","Существует множество вариантов решений - как только у вас имеется локальный коммит, вы можете соединить его с другой веткой. Это значит, вы можете выполнить одну из команд:","","* `git cherry-pick o/master`","* `git rebase o/master`","* `git merge o/master`","* и т.д.","","Процедура *скачивания (fetching)*  изменений с удалённой ветки и *объединения (merging)* настолько частая и распространённая, что git предоставляет вместо двух команд - одну! Эта команда  - `git pull`."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Давайте рассмотрим, как `fetch` и `merge` выполняются последовательно"],afterMarkdowns:["Опа - мы скачали `C3` с помощью команды `fetch` и затем объединяем эти наработки с помощью `git merge o/master`. Теперь наша ветка `master` отображает изменения с удалённого репозитория (в данном случае — с репозитория `origin`)"],command:"git fetch; git merge o/master",beforeCommand:"git clone; git commit; git fakeTeamwork"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Что же произойдёт, если вместо этих команд мы воспользуемся `git pull`?"],afterMarkdowns:["Абсолютно то же самое! Нужно чётко понимать, что `git pull` существенно уменьшает вашу рутинную работу, если бы вы использовали `git fetch` и последующее слияние (merging) скаченной ветки."],command:"git pull",beforeCommand:"git clone; git commit; git fakeTeamwork"}},{type:"ModalAlert",options:{markdowns:["Мы изучим детали команды `git pull` чуть позже (включая опции и аргументы вызова команды), а пока что давайте просто попробуем эту команду.","","Помните, вы также можете выполнить этот уровень с помощью команд `fetch` и `merge`, но нужно ли делать так, когда можно воспользоваться всего лишь одной командой ? :P"]}}]},ja:{childViews:[{type:"ModalAlert",options:{markdowns:["## Git Pull","","今や私たちはリモートリポジトリから`git fetch`でデータを取ってくる方法を知っているので、今度は私たちの作業にその変更を反映することを学びましょう！","","実際には多くの方法があり、ローカルに利用可能なリモートの新しいコミットがある場合、あなたはそのコミットを他のブランチの通常のコミットと同じように、自分の作業に組み込むことができます。これは、あなたが次のようなコマンドを実行することで行えます:","","* `git cherry-pick o/master`","* `git rebase o/master`","* `git merge o/master`","* その他","","実は、リモートの変更を取ってきてマージするという作業の流れはとてもよく行われるので、gitは実際にはその二つを同時に行うコマンドを提供しているのです！それは、`git pull`というコマンドです。"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["まずは、連続して`fetch`して`merge`する流れの方を見てみましょう。"],afterMarkdowns:["わーお。私たちは`C3`を`fetch`でダウンロードして、`git merge o/master`でこれをマージしました。今や私たちの`master`ブランチに(この場合、`origin`という名前の)リモートの新しい作業内容が反映されています。"],command:"git fetch; git merge o/master",beforeCommand:"git clone; git commit; git fakeTeamwork"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["では、`git pull`では何が起こるのでしょうか？"],afterMarkdowns:["同じことが起こります！明確に`git pull`は`git fetch`して取ってきたブランチの内容をマージするという流れの短縮系であることが確認できます。"],command:"git pull",beforeCommand:"git clone; git commit; git fakeTeamwork"}},{type:"ModalAlert",options:{markdowns:["`git pull`の（オプションや引数を含む）詳細はこの後にやりますが、今、このレベルではただ試してみるだけにしておきましょう。","","覚えておいてください。あなたは実際にはこのレベルを`fetch`と`merge`だけでこのレベルを解決することができますが、余計なコマンドのコストがかかるだけです :P"]}}]},uk:{childViews:[{type:"ModalAlert",options:{markdowns:["## Git Pull","","Тепер, коли ми знаємо як витягувати дані з віддаленого репозиторію за допомогою `git fetch`, спробуймо оновити нашу робочу копію відповідно до цих данних!","","Насправді, є кілька шляхів як цого досягнути -- щойно нові коміти з’явилися локально, ти можеш додавати їх в бранчі так само, як звичайні коміти. Це означає що ти можеш виконувати команди:","","* `git cherry-pick o/master`","* `git rebase o/master`","* `git merge o/master`","* тощо.","","Насправді, процес *витягування* віддалених змін й подальший *мерджинг* їх є настільки популярним, що гіт пропонує спеціальну команду, що виконує ці дві дії за один раз! Ця команда називається `git pull`."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Спершу виконаймо по черзі `fetch`, а потім `merge`"],afterMarkdowns:["Ка-бум -- ми звантажили `C3` за допомогою `fetch` і потім змерджили їх, використавши `git merge o/master`. Тепер наша гілка `master` відповідає гілці з віддаленого сховища (в цьому випадку, з назвою `origin`)"],command:"git fetch; git merge o/master",beforeCommand:"git clone; git commit; git fakeTeamwork"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Що трапиться, якщо натомість використати `git pull`?"],afterMarkdowns:["Те саме! Тепер очевидно що `git pull` -- це просто швидкий спосіб зробити `git fetch`, а потім змерджити завантажену гілку."],command:"git pull",beforeCommand:"git clone; git commit; git fakeTeamwork"}},{type:"ModalAlert",options:{markdowns:["Ми розглянемо `git pull` більш детально пізніше (включаючи різні опції та аргументи), наразі просто спробуймо цю команду.","","Не забувай -- щоб пройти цей рівень, достатньо використати `fetch`, а потім `merge`, але це буде тобі коштувати одну зайву команду :P"]}}]},ko:{childViews:[{type:"ModalAlert",options:{markdowns:["## Git Pull","","자 우리는 원격 저장소에서 `git fetch`로 어떻게 데이터를 내려 받는지 보았습니다. 이제 우리의 작업을 업데이트해서 변경들을 반영해 봅시다!","","사실 이걸 하는 방법은 여러가지 있습니다 -- 새 커밋들을 로컬에 내려받은 이후에는 그냥 다른 브랜치에있는 일반 커밋처럼 활용할 수 있습니다. 이런 명령들을 실행할 수 있다는 뜻 입니다 :","","* `git cherry-pick o/master`","* `git rebase o/master`","* `git merge o/master`","* 기타 등등","","사실 원격 저장소의 변경을 *fetch*하고 그이후에 *merge*하는 작업의 과정이 워낙 자주있는 일이라서 git은 이 두가지를 한번에 하는 명령을 제공합니다! 이 명령어는 `git pull` 입니다."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["먼저 `fetch` 와 `merge`가 차례로 실행되는것을 확인해 봅시다"],afterMarkdowns:["Boom -- 우리는 `C3`를 `fetch`로 내려 받고 `git merge o/master`로 우리의 작업으로 병합했습니다. 이제 우리의 `master` 브랜치는 원격 저장소의 새 작업들을 반영하게 됩니다(지금 사례에서 `origin`입니다)."],command:"git fetch; git merge o/master",beforeCommand:"git clone; git commit; git fakeTeamwork"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["대신에 `git pull`을 사용하면 어떻게 될까요?"],afterMarkdowns:["똑같은 일이 일이납니다! 이렇게 `git pull`은 본질적으로 `git fetch`후에 내려받은 브랜치를 병합하는 과정의 단축입니다. 확실하게 느껴지죠?."],command:"git pull",beforeCommand:"git clone; git commit; git fakeTeamwork"}},{type:"ModalAlert",options:{markdowns:["`git pull`의 세부적인 사항들은 나중에 알아보겠습니다 (옵션과 매개변수등) 지금은 이 레벨에서 일단 시도부터 해 봅시다.","","알고 넘어갑시다 -- 이 레벨을 그냥 `fetch`와 `merge`의 조합으로 해결할 수 있습니다. 하지만 명령어가 추가되겠지요 :P"]}}]},vi:{childViews:[{type:"ModalAlert",options:{markdowns:["## Git Pull","","Ta đã biết cách dùng `git fetch` để nạp các commit từ kho chứa từ xa, giờ hãy cập nhật các commit này vào các nhánh địa phương!","","Thực ra thì có nhiều cách đề làm điều này -- một khi bạn đã có các commit này ở ko chứa địa phương, bạn có thể hợp nhất chúng như với các commit ở các nhánh khác. Nghĩa là bạn có thể sử dụng các câu lệnh sau:","","* `git cherry-pick o/master`","* `git rebase o/master`","* `git merge o/master`","* etc., etc.","","Thực tế thì, quá trình *nạp* commit từ kho chứa từ xa và *hợp nhất* chúng phổ biết đến nỗi git cung cấp một câu lệnh để làm cả 2 điều này một lúc! Đó là `git pull`."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Trước tiên hãy xem quá trình `nạp` và `hợp nhất` được thực hiện một cách tuần tự"],afterMarkdowns:["Bùùm -- ta tải xuống commit `C3` với lệnh `git fetch` rồi sau đó hợp nhất nó với lệnh `git merge o/master`. Giờ thì nhánh `master` đã phản ánh trạng thái mới từ kho chứa từ xa (trong trường hợp này là `origin`)"],command:"git fetch; git merge o/master",beforeCommand:"git clone; git commit; git fakeTeamwork"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Nếu thay vì dó ta dùng `git pull` thì điều gì xảy ra?"],afterMarkdowns:["Cũng như nhau! Điều đó có nghĩa là `git pull` về cơ bản là cách làm tắt cho việc thực hiện tuần tự `git fetch` sau đó là hợp nhất các nhánh từ xa được nạp."],command:"git pull",beforeCommand:"git clone; git commit; git fakeTeamwork"}},{type:"ModalAlert",options:{markdowns:["Ta sẽ tìm hiều chi tiết về `git pull` sau (bao gồm các tùy chọn và tham số), còn bây giờ thì cứ dùng thử nó ở cấp độ này đã.","","Nhớ rằng -- bạn có thể giải quyết cấp độ này với `fetch` và sau đó `merge`, nhưng mà như thế thì lại tốn têm một câu lệnh :P"]}}]}}}},{}],139:[function(e,t,o){o.level={goalTreeString:'{"branches":{"master":{"target":"C6","id":"master","remoteTrackingBranchID":"o/master"},"o/master":{"target":"C1","id":"o/master","remoteTrackingBranchID":null},"o/bar":{"target":"C1","id":"o/bar","remoteTrackingBranchID":null},"foo":{"target":"C3","id":"foo","remoteTrackingBranchID":null},"side":{"target":"C2","id":"side","remoteTrackingBranchID":null}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"},"C4":{"parents":["C1"],"id":"C4"},"C3":{"parents":["C1"],"id":"C3"},"C5":{"parents":["C3","C4"],"id":"C5"},"C2":{"parents":["C1"],"id":"C2"},"C6":{"parents":["C2","C5"],"id":"C6"}},"HEAD":{"target":"master","id":"HEAD"},"originTree":{"branches":{"master":{"target":"C2","id":"master","remoteTrackingBranchID":null},"bar":{"target":"C3","id":"bar","remoteTrackingBranchID":null}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"},"C2":{"parents":["C1"],"id":"C2"},"C3":{"parents":["C1"],"id":"C3"}},"HEAD":{"target":"bar","id":"HEAD"}}}',solutionCommand:"git pull origin bar:foo;git pull origin master:side",startTree:'{"branches":{"master":{"target":"C4","id":"master","remoteTrackingBranchID":"o/master"},"o/master":{"target":"C1","id":"o/master","remoteTrackingBranchID":null},"o/bar":{"target":"C1","id":"o/bar","remoteTrackingBranchID":null}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"},"C4":{"parents":["C1"],"id":"C4"}},"HEAD":{"target":"master","id":"HEAD"},"originTree":{"branches":{"master":{"target":"C2","id":"master","remoteTrackingBranchID":null},"bar":{"target":"C3","id":"bar","remoteTrackingBranchID":null}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"},"C2":{"parents":["C1"],"id":"C2"},"C3":{"parents":["C1"],"id":"C3"}},"HEAD":{"target":"bar","id":"HEAD"}}}',name:{en_US:"Pull arguments",zh_CN:"Git pull 的参数",zh_TW:"pull 的參數",es_AR:"Parámetros de pull",es_ES:"Parámetros de pull",pt_BR:"Parâmetros do pull",gl:"Parámetros de pull",de_DE:"Optionen für Pull",ja:"Pullの引数",fr_FR:"Arguments de pull",ru_RU:"Аргументы для pull",ko:"pull 인자들",uk:"Аргументи pull",vi:"Tham số pull"},hint:{en_US:"Remember that you can create new local branches with fetch/pull arguments",zh_CN:"记住, 你可以通过 fetch/pull 创建本地分支",zh_TW:"記住，你可以透過 fetch 以及 pull 來建立一個新的 local 的 branch",es_AR:"Acordate de que podés crear nuevas ramas locales usando los parámetros de fetch/pull",es_ES:"Recuerda que puedes crear nuevas ramas locales usando los parámetros de fetch/pull",pt_BR:"Lembre-se que você pode criar novos ramos locais com parâmetros de fetch/pull",gl:"Lémbrate que podes crear novas ramas locais con parámetros de fetch/pull",de_DE:"Du kannst neue lokale Branches mittels fetch / pull erstellen",ja:"Fetchとpullの引数を利用してローカルで新規ブランチを作成できるのをお忘れなく",fr_FR:"Vous pouvez aussi créer une nouvelle branche locale avec les arguments de fetch/pull",ru_RU:"Напоминаю, что новые ветки можно создавать и с помощью команд fetch/pull",ko:"fetch/pull 과 인자들로 새 로컬 브랜치를 생성할수 있다는것을 기억하세요.",uk:"Пам'ятай, що ти можеш створювати нові гілки, використовуючи fetch/pull з аргументами",vi:"Nhớ rằng,bạn có thể tạo nhánh cục bộ mới với tham số của fetch/pull"},startDialog:{en_US:{childViews:[{type:"ModalAlert",options:{markdowns:["## Git pull arguments","","Now that you know pretty much *everything* there is to know about arguments for `git fetch` and `git push`, there's almost really nothing left to cover for git pull :)","","That's because git pull at the end of the day is *really* just shorthand for a fetch followed by merging in whatever was just fetched. You can think of it as running git fetch with the *same* arguments specified and then merging in *where* those commits ended up.","","This applies even when you use crazy-complicated arguments as well. Let's see some examples:"]}},{type:"ModalAlert",options:{markdowns:["Here are some equivalent commands in git:","","`git pull  origin foo` is equal to:","","`git fetch origin foo; git merge o/foo`","","And...","","`git pull  origin bar~1:bugFix` is equal to:","","`git fetch origin bar~1:bugFix; git merge bugFix`","","See? git pull is really just shorthand for fetch + merge, and all git pull cares about is where the commits ended up (the `destination` argument that it figures out during fetch).","","Lets see a demo:"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["If we specify the place to fetch, everything happens as before with fetch but we merge in whatever was just fetched"],afterMarkdowns:["See! by specifying `master` we downloaded commits onto `o/master` just as normal. Then we merged `o/master` to our currently checked out location which is *not* the local branch `master`. For this reason it can actually make sense to run git pull multiple times (with the same args) from different locations in order to update multiple branches."],command:"git pull origin master",beforeCommand:"git clone; go -b bar; git commit; git fakeTeamwork"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Does it work with source and destination too? You bet! Let's see that:"],afterMarkdowns:["Wow, that's a TON in one command. We created a new branch locally named `foo`, downloaded commits from remote's master onto that branch `foo`, and then merged that branch into our currently checked out branch `bar`. It's over 9000!!!"],command:"git pull origin master:foo",beforeCommand:"git clone; git fakeTeamwork; go -b bar; git commit"}},{type:"ModalAlert",options:{markdowns:["Ok to finish up, attain the state of the goal visualization. You'll need to download some commits, make some new branches, and merge those branches into other branches, but it shouldn't take many commands :P"]}}]},fr_FR:{childViews:[{type:"ModalAlert",options:{markdowns:["## Les arguments de git pull","","Maintenant que vous savez presque *tout* ce qu'il y a à savoir sur les arguments de `git fetch` et `git push`, il n'y a presque plus rien à vous apprendre sur git pull :)","","C'est parce que git pull est en fait *juste* un raccourci pour un fetch suivi d'un merge de tout ce qui vient d'être rapatrié. Vous pouvez vous représenter git pull comme un git fetch avec les *mêmes* arguments, suivi d'un merge qui aura lieu à l'endroit *exact* où ces commits seront arrivés.","","Cela fonctionne même quand vous utilisez des arguments très compliqués. Voyons quelques exemples :"]}},{type:"ModalAlert",options:{markdowns:["Voici quelques commandes équivalentes dans git :","","`git pull origin foo` est équivalent à :","","`git fetch origin foo; git merge o/foo`","","Et :","","`git pull origin bar~1:bugFix` est équivalent à :","","`git fetch origin bar~1:bugFix; git merge bugFix`","","Vous voyez ? git pull est au fond un simple un raccourci pour fetch + merge, et tout ce qui lui importe est la destination des commits (l'argument `destination` qu'il utilise durant le fetch).","","Voyons une démonstration :"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Si nous précisons l'emplacement à rapatrier tout se passe comme précédemment, avec fetch, mais en sus nous fusionnons tout ce qui a été rapatrié."],afterMarkdowns:["Vu ? En précisant `master` nous avons téléchargé les commits dans `o/master` comme d'habitude. Puis nous avons fusionné `o/master` avec là où nous sommes, *sans nous soucier* de la branche courante."],command:"git pull origin master",beforeCommand:"git clone; go -b bar; git commit; git fakeTeamwork"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Cela fonctionne-t-il aussi bien avec une source et une destination ? Et oui ! Voyons cela :"],afterMarkdowns:["Wow, INCROYABLE tout ce que nous avons fait en une commande. Nous avons créé une branche locale nommée `foo`, téléchargé les commits depuis la branche master distante dans `foo`, et ensuite fusionné cette branche dans notre branche actuelle de travail (checkoutée) `bar` !!!"],command:"git pull origin master:foo",beforeCommand:"git clone; git fakeTeamwork; go -b bar; git commit"}},{type:"ModalAlert",options:{markdowns:["Ok, pour finir ce niveau reproduisez l'état de la fenêtre Objectif. Vous aurez besoin de télécharger quelques commits, de créer des branches et de les fusionner dans d'autres branches, mais cela ne devrait pas utiliser trop de commandes :P"]}}]},es_AR:{childViews:[{type:"ModalAlert",options:{markdowns:["## Parámetros de git pull","","Ahora que sabés prácticamente *todo* lo que hay que saber sobre los parámetros de `git fetch` y `git push`, casi que no queda nada para cubrir de git pull :)","","Eso es porque git pull es simplemente un atajo para hacer un fetch seguido de un merge. Podés pensarlo como correr git fetch con los *mismos* parámetros, y después mergear aquello a donde esos commits hayan ido a parar.","","Esto aplica incluso cuando usás parámetros hiper-rebuscados. Veamos algunos ejemplos:"]}},{type:"ModalAlert",options:{markdowns:["Estos son algunos comandos equivalentes de git:","","`git pull  origin foo` equivale a:","","`git fetch origin foo; git merge o/foo`","","Y...","","`git pull  origin bar~1:bugFix` equivale a:","","`git fetch origin bar~1:bugFix; git merge bugFix`","","¿Ves? git pull es simplemente un atajo para un fetch + merge, y todo lo que le importa a git pull es dónde terminaron esos commits (el parámetro `destino` que determina durante el fetch).","","Veamos una demostración:"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Si especificamos el lugar del que hacer fetch, todo ocurre como antes, pero sólo mergeamos lo que se fetcheó"],afterMarkdowns:["¡Ves! Especificando `master` bajamos los commits a `o/master` como siempre. Después mergeamos `o/master` a nuestra rama actual, *sin importar* qué había en nuestra copia de trabajo."],command:"git pull origin master",beforeCommand:"git clone; go -b bar; git commit; git fakeTeamwork"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["¿Esto funciona con origen y destino, también? ¡Más vale! Veámoslo:"],afterMarkdowns:["Wow, eso es un MONTÓN en un único comando. Creamos una nueva rama local llamada `foo`, descargamos los commits del master del remoto a esta rama `foo`, y después mezclamos esa rama a nuestra rama actual `bar`. ¡¡¡Supera los 9000!!!"],command:"git pull origin master:foo",beforeCommand:"git clone; git fakeTeamwork; go -b bar; git commit"}},{type:"ModalAlert",options:{markdowns:["OK: para terminar, alcanzá el estado del objetivo. Vas a necesitar descargar algunos commits, crear algunas ramas nuevas, y mergear esas ramas junto con otras, pero no debería llevar demasiados comandos :P"]}}]},es_ES:{childViews:[{type:"ModalAlert",options:{markdowns:["## Parámetros de git pull","","Ahora que sabes prácticamente *todo* lo que hay que saber sobre los parámetros de `git fetch` y `git push`, casi no queda nada por cubrir del comando git pull :)","","Eso es porque git pull es simplemente un atajo para hacer un fetch seguido de un merge. Puedes imaginártelo como ejecutar git fetch con los *mismos* parámetros, y después hacer merge de ello hacia donde esos commits hayan ido a parar.","","Esto aplica incluso cuando utilizas parámetros rebuscados en exceso. Veamos algunos ejemplos:"]}},{type:"ModalAlert",options:{markdowns:["Estos son algunos comandos equivalentes de git:","","`git pull  origin foo` equivale a:","","`git fetch origin foo; git merge o/foo`","","Y...","","`git pull  origin bar~1:bugFix` equivale a:","","`git fetch origin bar~1:bugFix; git merge bugFix`","","¿Ves? git pull es simplemente un atajo para un fetch + merge, y todo lo que le importa a git pull es dónde terminaron esos commits (el parámetro `destino` que determina durante el fetch).","","Veamos una demostración:"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Si especificamos el lugar desde donde hacer fetch, todo ocurre como antes, pero sólo mergeamos lo que se fetcheó"],afterMarkdowns:["¡Ves! Especificando `master` descargamos los commits a `o/master` como siempre. Después mergeamos `o/master` a nuestra rama actual, *sin importar* qué había en nuestra copia de trabajo."],command:"git pull origin master",beforeCommand:"git clone; go -b bar; git commit; git fakeTeamwork"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["¿Esto funciona con origen y destino, también? ¡Más vale! Veámoslo:"],afterMarkdowns:["Caramba, eso es una BARBARIDAD en un único comando. Creamos una nueva rama local llamada `foo`, descargamos los commits del master del remoto a esta rama `foo`, y después mezclamos esa rama a nuestra rama actual `bar`. ¡¡¡Supera los 9000!!!"],command:"git pull origin master:foo",beforeCommand:"git clone; git fakeTeamwork; go -b bar; git commit"}},{type:"ModalAlert",options:{markdowns:["OK: para terminar, intenta alcanzar el estado del objetivo. Vas a necesitar descargar algunos commits, crear algunas ramas nuevas, y mergear esas ramas junto con otras, pero no debería llevar demasiados comandos :P"]}}]},pt_BR:{childViews:[{type:"ModalAlert",options:{markdowns:["## Parâmetros do git pull","","Agora que você sabe praticamente *tudo* que há para saber sobre parâmetros do `git fetch` e `git push`, não há praticamente nada a se abordar a respeito do  git pull :)","","Isso é porque o git pull no final das contas é *realmente* apenas um atalho para um fetch seguido de um merge em seja lá o que acabou de ser baixado. Você pode pensar nele como rodar o git fetch recebendo os *mesmos* argumentos, seguido de um merge no lugar *onde* esses commits foram parar.","","Isso se aplica mesmo no caso de argumentos loucamente complicados. Vejamos alguns exemplos:"]}},{type:"ModalAlert",options:{markdowns:["Aqui estão alguns comandos que são equivalente para o Git:","","`git pull  origin foo` é igual a:","","`git fetch origin foo; git merge o/foo`","","E...","","`git pull  origin bar~1:bugFix` é igual a:","","`git fetch origin bar~1:bugFix; git merge bugFix`","","Viu? O git pull é realmente um atalho para fetch + merge, e tudo com o que o git pull se importa é com onde os commits foram parar (o parâmetro de `destino` que ele descobre durante o fetch).","","Vejamos uma demonstração:"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Se especificarmos o lugar onde fazer o fetch, tudo acontece como antes com o fetch, mas fazemos o merge naquilo que acabou de ser baixado"],afterMarkdowns:["Veja! Especificando `master` nós baixamos commits em `o/master` como sempre. Então fizemos um merge de `o/master` com o lugar onde estamos, *independente* daquilo que está atualmente em checkout."],command:"git pull origin master",beforeCommand:"git clone; go -b bar; git commit; git fakeTeamwork"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Isso também funciona com origem e destino especificados? Sim, você acertou! Vejamos:"],afterMarkdowns:["Wow, isso é MUITA coisa em um comando só. Nós criamos um novo ramo local chamado `foo`, baixamos commits do master remoto nesse ramo `foo`, e então fizemos um merge dele com o ramo atualmente em checkout, `bar`."],command:"git pull origin master:foo",beforeCommand:"git clone; git fakeTeamwork; go -b bar; git commit"}},{type:"ModalAlert",options:{markdowns:["Ok, para terminar, obtenha o estado da visualização do objetivo. Você vai precisar baixar alguns commits, criar novos ramos, e fazer merge de ramos em outros ramos, mas não deve precisar de muitos comandos para isso :P"]}}]},gl:{childViews:[{type:"ModalAlert",options:{markdowns:["## Parámetros de git pull","","Agora que sabes prácticamente *todo* o que hai que saber sobre os parámetros de `git fetch` e `git push`, casi que non queda nada para cubrir os de git pull :D","","Eso é porque git pull é sinxelamente un atallo para facer un fetch seguido dun merge. Podes pensalo como executar git fetch cos *mesmos* parámetros, e logo mesturar aquelo onde esos commits houberan ido ficar.","","Esto aplica incluso cando usas parámetros hiper-complexos. Vexamos algúns exemplos:"]}},{type:"ModalAlert",options:{markdowns:["Estos son algúns comandos equivalentes de git:","","`git pull  origin foo` equivale a:","","`git fetch origin foo; git merge o/foo`","","E...","","`git pull  origin bar~1:bugFix` equivale a:","","`git fetch origin bar~1:bugFix; git merge bugFix`","","¿Ves? git pull é sinxelamente un atallo para un fetch + merge, e todo o que lle importa a git pull é ónde terminaron eses commits (o parámetro `destino` que indícase durante o fetch).","","Vexamos unha demostración:"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Se especificamos o lugar do que facer o fetch, todo ocorre coma antes, pero só mesturamos o que se descargou"],afterMarkdowns:["¡Ves! Indicando `master` baixamos os commits á `o/master` coma sempre. Despois mesturamos `o/master` á nosa rama actual, *sen importar* qué tiñamos na nos copia de traballo."],command:"git pull origin master",beforeCommand:"git clone; go -b bar; git commit; git fakeTeamwork"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["¿Esto funciona co orixe e o destino, tamén? ¡Máis lle vale! Vexámolo:"],afterMarkdowns:["Wow, eso es unha CHEA nun único comando. Creamos unha nova rama local chamada `foo`, descargamos os commits do master do remoto a esta rama `foo`, e logo mesturamos esa rama á nosa rama actual `bar`. ¡¡¡Supera os 9000!!!"],command:"git pull origin master:foo",beforeCommand:"git clone; git fakeTeamwork; go -b bar; git commit"}},{type:"ModalAlert",options:{markdowns:["OK: para rematar, alcanza o estado do obxectivo. Vase necesitar descargar algúns commits, crear algunhas ramas novas, e mesturar esas ramas xunto con outras, pero non debería levar demasiados domandos :P"]}}]},zh_TW:{childViews:[{type:"ModalAlert",options:{markdowns:["## git pull 的參數","","現在你已經知道關於 `git fetch` 以及 `git push` 的*任何參數*，但是我們還可以再聊聊 `git pull`:)","","那是因為 `git pull` 到目前為止*的確*只是表示 fetch 之後再 merge 所 fetch 的 commit，你可以把它想成，當使用 `git fetch` 時使用*一樣*的參數，之後再從 fetch 下來的 commit *所放置*的位置做 merge。","","這同樣也適用於當你指定相當複雜的參數，讓我們來看一些例子："]}},{type:"ModalAlert",options:{markdowns:["對於 git 來說，有一些意義一樣的指令：","","`git pull  origin foo` 相當於：","","`git fetch origin foo; git merge o/foo`","","而且...","","`git pull  origin bar~1:bugFix` 相當於：","","`git fetch origin bar~1:bugFix; git merge bugFix`","","看吧？`git pull` 真的就只是表示 fetch 跟 merge 的一個簡化後的指令，而且 `git pull` 所根據的是這些 commit 要放置的位置（在 fetch 的時候所指定的`destination`）。","","讓我們來看一個例子："]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["如果我們在 fetch 的時候有指定`位置`的話，跟之前一樣，fetch 所做的事情沒有變，但是我們會 merge 我們剛剛所 fetch 的該`位置`的commit。"],afterMarkdowns:["看吧！指定位置為 `master`，跟平常一樣，我們下載了 commit 並且放到 `o/master` 上，接著，我們會 merge `o/master` 到我們現在的位置，*不管*我們現在所 checkout 的位置在哪裡。"],command:"git pull origin master",beforeCommand:"git clone; go -b bar; git commit; git fakeTeamwork"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["他是不是也可以同時指定 source 以及 destination？你說對了啦！讓我們來看一下："],afterMarkdowns:["哇！這個指令強而有力，我們在 local 建立了一個新的 `foo` branch，下載了 remote 的 `master` 的 commit，並且放到 local 的 `foo` branch，之後 merge `foo` branch 到我們目前所 checkout 的 `bar` branch。這實在是太超過了！！！"],command:"git pull origin master:foo",beforeCommand:"git clone; git fakeTeamwork; go -b bar; git commit"}},{type:"ModalAlert",options:{markdowns:["要完成這一關，達到視覺化目標的要求，你需要下載一些 commit，建立一些新的 branch，並且 merge 這些 branch 到其他的 branch 上面，這個關卡不需要打太多的指令:P"]}}]},zh_CN:{childViews:[{type:"ModalAlert",options:{markdowns:["## Git pull 参数","","既然你已经掌握关于 `git fetch` 和 `git push` 参数的方方面面了，关于 git pull 几乎没有什么可以讲的了 :)","","因为 git pull 到头来就是 fetch 后跟 merge 的缩写。你可以理解为用同样的参数执行 git fetch，然后再 merge 你所抓取到的提交记录。","","还可以和其它更复杂的参数一起使用, 来看一些例子:"]}},{type:"ModalAlert",options:{markdowns:["以下命令在 Git 中是等效的:","","`git pull origin foo` 相当于：","","`git fetch origin foo; git merge o/foo`","","还有...","","`git pull origin bar~1:bugFix` 相当于：","","`git fetch origin bar~1:bugFix; git merge bugFix`","","看到了? git pull 实际上就是 fetch + merge 的缩写, git pull 唯一关注的是提交最终合并到哪里（也就是为 git fetch 所提供的 destination 参数）","","一起来看个例子吧："]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["如果我们指定要抓取的 place，所有的事情都会跟之前一样发生，只是增加了 merge 操作"],afterMarkdowns:["看到了吧! 通过指定 `master` 我们更新了 `o/master`。然后将 `o/master` merge 到我们的检出位置，**无论**我们当前检出的位置是哪。"],command:"git pull origin master",beforeCommand:"git clone; go -b bar; git commit; git fakeTeamwork"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["pull 也可以用 source:destination 吗? 当然喽, 看看吧:"],afterMarkdowns:[" 哇, 这个命令做的事情真多。它先在本地创建了一个叫 `foo` 的分支，从远程仓库中的 master 分支中下载提交记录，并合并到 `foo`，然后再 merge 到我们的当前检出的分支 `bar` 上。操作够多的吧？！"],command:"git pull origin master:foo",beforeCommand:"git clone; git fakeTeamwork; go -b bar; git commit"}},{type:"ModalAlert",options:{markdowns:["好啦, 该结束了！请按照目标窗口中的状态进行操作。你需要下载一些提交，然后创建一些新分支，再合并这些分支到其它分支, 但这用不了几个命令 :P "]}}]},de_DE:{childViews:[{type:"ModalAlert",options:{markdowns:["## Optionen für Git Pull","","Da du jetzt so ziemlich *alles* kennst, was es an Optionen für `git fetch` und `git push` gibt, ist kaum noch etwas zu Optionen für `git pull` zu sagen. :)","","Das liegt daran, dass `git pull` letztendlich *wirklich* nur eine Abkürzuung für `fetch` gefolgt von einem `merge` von was auch immer gerade heruntergeladen wurde, ist. Denk es dir als ein `git fetch` mit denselben Optionen und einem anschließenden Merge.","","Das trifft sogar zu, wenn du völlig abgedrehte Optionen verwendest. Ein paar Beispiele:"]}},{type:"ModalAlert",options:{markdowns:["Hier sind einige gleichwertige Befehle in Git:","","`git pull origin foo` ist dasselbe wie:","","`git fetch origin foo; git merge o/foo`","","Und ...","","`git pull origin bar~1:bugFix` ist dasselbe wie:","","`git fetch origin bar~1:bugFix; git merge bugFix`","",'Siehst du? `git pull` ist wirklich nur eine Abkürzung von `fetch` + `merge` und es interessiert sich nur dafür wo die Commits hin sollen (die "Ziel"-Option, die es beim `fetch` auswertet).',"","Schauen wir uns eine Demonstration an:"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Wenn wir den Ort, auf den das `fetch` ausgeführt werden soll, angeben, passiert alles so wie beim `git fetch` aber es wird direkt danach auch ein Merge ausgeführt."],afterMarkdowns:["Siehst du? Da wir `master` angegeben haben sind die Commits in `o/master` heruntergeladen worden. Danach wurde `o/master` gemerged, egal was gerade ausgecheckt war."],command:"git pull origin master",beforeCommand:"git clone; go -b bar; git commit; git fakeTeamwork"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Funktioniert das auch wenn man Quelle und Ziel angibt? Aber sicher! Das sehen wir hier:"],afterMarkdowns:["Wow, das ist eine Menge in einem einzelnen Befehl. Wir haben lokal einen neuen Branch namens `foo` erstellt, die Commits vom `master` des Servers dorthin heruntergeladen und ihn danach in unseren aktuell ausgecheckten Commit `bar` gemerged."],command:"git pull origin master:foo",beforeCommand:"git clone; git fakeTeamwork; go -b bar; git commit"}},{type:"ModalAlert",options:{markdowns:["Ok, um's zu Ende zu bringen versuch das Ziel aus der Zielgrafik zu erreichen. Du wirst einige Commits herunterladen, einige neue Branches anlegen und diese in andere mergen müssen, aber das sollte nicht allzuviele Befehle benötigen. :P"]}}]},ru_RU:{childViews:[{type:"ModalAlert",options:{markdowns:["## Аргументы для pull","","Аргументы для `git pull` не покажутся вам чем-то новым, учитывая, что вы уже знакомы с аргументами для `git fetch` и `git push` :)","","Как мы помним, `git pull` сначала выполняет `git fetch`, а следом сразу `git merge` с той веткой, в которую притянулись обновления командой fetch. Другими словами, это все равно, что выполнить git fetch с теми же аргументами, которые вы указали для pull, а затем выполнить git merge с веткой, указанной в аргументе <приемник> команды pull.","","Рассмотрим на примерах:"]}},{type:"ModalAlert",options:{markdowns:["Вот примеры абсолютно эквивалентных команд в git:","","`git pull  origin foo` это то же самое, что сделать:","","`git fetch origin foo; git merge o/foo`","","И еще...","","`git pull  origin bar~1:bugFix` то же, что:","","`git fetch origin bar~1:bugFix; git merge bugFix`","","Как видно, git pull используется, чтобы за одну команду выполнить fetch + merge.","","Посмотрим демонстрацию:"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Здесь сначала выполнится fetch с аргументом указанным к pull, а merge выполняется с теми изменениями, которые будут скачаны командой fetch"],afterMarkdowns:["Как видно, мы указали `master`, поэтому как обычно все обновления притянулись на ветку `o/master`. Затем мы слили (merge) обновленную ветку `o/master` с веткой, на которой мы находимся."],command:"git pull origin master",beforeCommand:"git clone; go -b bar; git commit; git fakeTeamwork"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Будет ли это работать, если указать `<источник>` и `<приемник>`? Проверим:"],afterMarkdowns:["Ого, сколько всего выполнено всего одной командой!. Мы создали новую ветку `foo` в локальном репозитории, скачали на неё изменения с ветки `master` удаленного репозитория, а затем слили эту ветку с веткой `bar`, на которой мы находились!"],command:"git pull origin master:foo",beforeCommand:"git clone; git fakeTeamwork; go -b bar; git commit"}},{type:"ModalAlert",options:{markdowns:["В последнем упражнении необходимо привести дерево к аналогичному в примере. Нужно скачать несколько изменений, создать несколько новых веток, слить одни ветки в другие, но постарайтесь использовать как можно меньше команд. Удачи! :P"]}}]},ko:{childViews:[{type:"ModalAlert",options:{markdowns:["## Git pull의 인자들","","`git fetch`와 `git push`의 인자들을 다 알았기 때문에, git pull에서 더 설명할게 사실 없습니다 :)","","git pull은 결국 merge가 따라오는 fetch 그 자체이기 때문이죠. git fetch와 *같은* 인자를 사용하며 커밋들을 *어디*로 merge되는지 알면 됩니다.","","정신나간것마냥-복잡한 인자들도 기본적으로는 똑같다고 보면 됩니다. 예시를 살펴봅시다:"]}},{type:"ModalAlert",options:{markdowns:["git에서 다음 명령어들은 같습니다:","","`git pull  origin foo` 는 다음과 같습니다:","","`git fetch origin foo; git merge o/foo`","","그리고...","","`git pull  origin bar~1:bugFix` 는 다음과 같습니다:","","`git fetch origin bar~1:bugFix; git merge bugFix`","","보이죠? git pull은 그저 fetch + merge의 축약형일 뿐이에요, 그리고 git pull은 커밋들이 도착하는곳을 신경씁니다(fetch를 하며 지정된 `destination`인자의 위치로 merge가 수행됩니다).","","직접 확인해봅시다:"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["place를 지정하면, 이전에 fecth를 하던때와 완전히 똑같이 진행되고 fetch한것을 병합합니다."],afterMarkdowns:["보이죠! `master`를 지정해서 우리는 `o/master`에 평소처럼 커밋들을 내려받았습니다. 그다음 우리가 있는 곳으로 `o/master`를 병합했습니다 현재 체크아웃된 브랜치와 *상관없이* 말이죠"],command:"git pull origin master",beforeCommand:"git clone; go -b bar; git commit; git fakeTeamwork"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["source 와 destination 모두 적용될까요? 추측해보세요! 확인해봅시다:"],afterMarkdowns:["이야, 명령어 하나에 많은게 일어나고있습니다. 로컬에 이름이 `foo`인 새 브랜치를 만들고, 원격 저장소의 master에서 이 브랜치 `foo`에 커밋들을 내려받습니다, 그후 그 브랜치를 우리가 현재 체크아웃한 브랜치 `bar`로 병합했습니다. 오오오!!!"],command:"git pull origin master:foo",beforeCommand:"git clone; git fakeTeamwork; go -b bar; git commit"}},{type:"ModalAlert",options:{markdowns:["좋습니다 마무리하기 위해, 골 시각화와 같은 상태로 만들어 주세요. 커밋을 내려받고, 새 브랜치를 만들고, 그 브랜치들을 다른 브랜치로 병합해야 될겁니다, 하지만 명령어는 그렇게 많이 안써도 되죠 :P"]}}]},uk:{childViews:[{type:"ModalAlert",options:{markdowns:["## Аргументи git pull","","Зараз, коли ти знаєш майже *все*, що можна знати про аргументи для `git fetch` і `git push`, дійсно майже нема чого розповідати про git pull :)","","Це тому, що git pull, зрештою, *просто* зручне об'єднання fetch і merge. Його можна собі уявляти як git fetch і git merge виконані з *однаковими* аргументами.","","Це працює незалежно від складності переданих аргументів. Розгляньмо:"]}},{type:"ModalAlert",options:{markdowns:["Ось декілька еквівалентних команд git:","","`git pull origin foo` це те саме, що й:","","`git fetch origin foo; git merge o/foo`","","А...","","`git pull origin bar~1:bugFix` -- це аналог:","","`git fetch origin bar~1:bugFix; git merge bugFix`","","Бачиш? git pull -- це просто зручне скорочення для fetch + merge. А все, про що дбає git pull -- це те, куди в результаті підуть коміти (а про це йому говорить аргумент `destination`).","","Розгляньмо демонстрацію:"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Якщо ми вказуємо місце призначення для fetch, fetch виконується як звичайно, але мердж відбудеться з тим, що ми щойно стягнули"],afterMarkdowns:["От бачиш, вказавши `master`, ми звантажили коміти в `o/master`, як завжди. Потім змерджили `o/master` в поточну гілку."],command:"git pull origin master",beforeCommand:"git clone; go -b bar; git commit; git fakeTeamwork"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Чи це працює також при вказанні `source` і `destination`? І не сумнівайся! Ось приклад:"],afterMarkdowns:["Ого, стільки роботи однією командою. Ми створили локальну гілку з назвою `foo`, звантажили в неї коміти з віддаленого master, а потім змерджили `foo` в поточну гілку `bar`!"],command:"git pull origin master:foo",beforeCommand:"git clone; git fakeTeamwork; go -b bar; git commit"}},{type:"ModalAlert",options:{markdowns:["Добре, для завершення спробуй досягти стану репозиторію, показаного на візуалізації. Треба буде звантажити відсутні коміти, створити нові гілки і змерджити їх в інші гілки, але не надто великою кількістю команд! :P"]}}]},vi:{childViews:[{type:"ModalAlert",options:{markdowns:["## Tham số git pull","","Giờ thì bạn đã biết gần như là *tất cả* về tham số của `git fetch` và `git push`, thế thì hầu như chẳng còn gì mới cho git pull cả :)","","Đó và vì nói cho cùng thì git pull *về thực tế* cũng chỉ là lệnh tắt cho tìm nạp và sau đó là hợp nhất những gì vừa mới được nạp. Bạn có thể coi nó như là chạy lệnh git fetch với *cùng* tham số được chỉ định và sau đó hợp nhất các commit vào *nơi* được chỉ định.","","Điều này được áp dụng kể cả khi bạn sử dụng những tham số phức tạp đến độ điên rồ. Hãy xem qua một vài ví dụ:"]}},{type:"ModalAlert",options:{markdowns:["Dưới đây là một vài câu lệnh tương đồng nhau trong git:","","`git pull  origin foo` tương đương với:","","`git fetch origin foo; git merge o/foo`","","Và...","","`git pull  origin bar~1:bugFix` tương đương với:","","`git fetch origin bar~1:bugFix; git merge bugFix`","","Thấy chứ? git pull thực ra chỉ là lệnh tắt cho fetch + merge, và tất cả những gì git pull quan tâm là nơi mà các commit sẽ tới (tham số `đích` mà nó diễn giải được trong quá trình nạp).","","Hãy xem qua một bản giới thiệu:"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Nếu ta chỉ định vị trí để nạp, mọi thứ diễn ra như với git fetch nhưng giờ đây có thêm một bước đó là ta hợp nhất những gì mà ta đã nạp"],afterMarkdowns:["Thấy chứ! Bằng cách chỉ định nhánh `master` ta tải các commit xuống nhánh `o/master` như thường lệ. Sau đó hợp nhất nhánh `o/master` vào nhánh cục bộ mà ta đang đứng, nhánh mà *không phải* nhánh cục bộ `master`. Nhờ vậy mà ta có thể chạy cùng một lệnh git pull(với cùng tham số) nhiều lần ở những vị trí khác nhau để áp dụng cùng cập nhật lên các nhánh khác nhau."],command:"git pull origin master",beforeCommand:"git clone; go -b bar; git commit; git fakeTeamwork"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Điều này có hoạt động với đích và nguồn không? Đoán đúng rồi đấy! Cùng xem thử nào:"],afterMarkdowns:["Wao, quá NHIỀU trong một câu lệnh. Ta tạo ra một nhánh cục bộ là `foo`, tải commit xuống từ nhánh từ xa master xuống nhánh `foo` đó, và sau đó hợp nhất commit vào nhánh `bar` mà ta đang đứng. Đủ thứ luôn!!!"],command:"git pull origin master:foo",beforeCommand:"git clone; git fakeTeamwork; go -b bar; git commit"}},{type:"ModalAlert",options:{markdowns:["Được rồi, để kết thúc khóa học, hãy đạt đến mục tiêu được mô tả. Bạn sẽ cần tải xuống vài commit, tạo ra vài nhánh mới, và hợp nhất những nhánh đó sang những nhánh khác, nhưng mà đừng dùng nhiều lệnh quá nhé :P"]}}]}}}},{}],140:[function(e,t,o){o.level={disabledMap:{"git fakeTeamwork":!0},goalTreeString:'{"branches":{"master":{"target":"C3","id":"master","remoteTrackingBranchID":"o/master","localBranchesThatTrackThis":null},"o/master":{"target":"C3","id":"o/master","remoteTrackingBranchID":null,"localBranchesThatTrackThis":["master"]}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"},"C2":{"parents":["C1"],"id":"C2"},"C3":{"parents":["C2"],"id":"C3"}},"HEAD":{"target":"master","id":"HEAD"},"originTree":{"branches":{"master":{"target":"C3","id":"master","remoteTrackingBranchID":null,"localBranchesThatTrackThis":null}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"},"C2":{"parents":["C1"],"id":"C2"},"C3":{"parents":["C2"],"id":"C3"}},"HEAD":{"target":"master","id":"HEAD"}}}',solutionCommand:"git commit;git commit;git push",startTree:'{"branches":{"master":{"target":"C1","id":"master","remoteTrackingBranchID":"o/master"},"o/master":{"target":"C1","id":"o/master","remoteTrackingBranchID":null}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"}},"tags":{},"HEAD":{"target":"master","id":"HEAD"},"originTree":{"branches":{"master":{"target":"C1","id":"master","remoteTrackingBranchID":null}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"}},"tags":{},"HEAD":{"target":"master","id":"HEAD"}}}',name:{en_US:"Git Pushin'",zh_CN:"Git Push",zh_TW:"git push",es_AR:"git push",es_ES:"git push",pt_BR:"Git Push",gl:"Git Push",de_DE:"Git Push",ja:"Git Push",fr_FR:"Git push",ru_RU:"Git push",uk:"Git push",ko:"Git push",vi:"Git push"},hint:{en_US:"Remember you have to clone before you can push!",zh_CN:"推送之前需要先克隆",zh_TW:"push 之前你需要先 clone",es_AR:"¡Acordate que tenés que clonar antes de pushear!",es_ES:"¡Recuerda que tienes que clonar antes de hacer push!",pt_BR:"Lembre-se de clonar antes de fazer o push!",de_DE:"Denk dran, dass du einen Clone brauchst bevor du Pushen kannst!",ja:"Pushができるようになるには、まずリポジトリをcloneする必要があるのをお忘れなく",fr_FR:"Rappelez-vous que vous devez cloner avant de pouvoir faire un push !",ru_RU:"Помните, что прежде чем push-ить вам нужно склонировать репозиторий!",uk:"Пам’ятай, що перед тим як щось push-нути потрібно склонувати репозиторій!",ko:"push를 하기전에 clone을 먼저해야 된다는것을 기억하세요!",vi:"Nhớ rằng bạn phải clone trước khi push!"},startDialog:{en_US:{childViews:[{type:"ModalAlert",options:{markdowns:["## Git Push","","Ok, so I've fetched changes from remote and incorporated them into my work locally. That's great and all... but how do I share _my_ awesome work with everyone else?","","Well, the way to upload shared work is the opposite of downloading shared work. And what's the opposite of `git pull`? `git push`!","","`git push` is responsible for uploading _your_ changes to a specified remote and updating that remote to incorporate your new commits. Once `git push` completes, all your friends can then download  your work from the remote.","",'You can think of `git push` as a command to "publish" your work. It has a bunch of subtleties that we will get into shortly, but let\'s start with baby steps...',"","*note -- the behavior of `git push` with no arguments varies depending on one of git's settings called `push.default`. The default value for this setting depends on the version of git you're using, but we are going to use the `upstream` value in our lessons. This isn't a huge deal, but it's worth checking your settings before pushing in your own projects.*"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Here we have some changes that the remote does not have. Let's upload them!"],afterMarkdowns:["There we go -- the remote received commit `C2`, the branch `master` on the remote was updated to point at `C2`, and our *own* reflection of the remote (`o/master`) was updated as well. Everything is in sync!"],command:"git push",beforeCommand:"git clone; git commit"}},{type:"ModalAlert",options:{markdowns:["To finish this level, simply share two new commits with the remote. Strap in though, because these lessons are about to get a lot harder!"]}}]},fr_FR:{childViews:[{type:"ModalAlert",options:{markdowns:["## Git Push","","Ok, donc j'ai rapatrié les changements du dépôt distant et je les ai incorporés dans mon travail local. C'est super... mais comment je partage _mon_ travail génial avec tous les autres ?","","En fait, la manière d'envoyer du travail à partager fonctionne à l'opposé du téléchargement de travail partagé. Et quel est l'opposé de `git pull` (tire) ? `git push` (pousse) !","","`git push` est responsable de l'envoi de _vos_ changements vers un dépôt distant et de la mise à jour de ce dépôt pour incorporer vos commits. Une fois `git push` terminé, tous vos amis peuvent télécharger votre travail depuis le dépôt distant.","",'Vous pouvez voir `git push` comme une commande qui "publie" votre travail. Elle présente quelques subtilités que nous allons voir rapidement, mais commençons par le B.A.-BA...',"","*Note : le comportement de `git push` avec aucun argument varie avec l'un des réglages de configuration de git nommé `push.default`. La valeur par défaut de ce réglage dépend de la version de git utilisée, mais nous allons utiliser la valeur `upstream` dans nos leçons. Cela ne change pas grand chose pour ces exercices, mais vérifiez tout de même vos réglages avant de pusher vos propres projets.*"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Nous avons fait ici quelques changements que le dépôt distant n'a pas. Envoyons-les !"],afterMarkdowns:["Et voilà : le dépôt distant a reçu le commit `C2`, la branche `master` a été mise à jour sur `C2`, et votre *propre* représentation de la branche distante (`o/master`) a aussi été mise à jour. Tout est synchronisé !"],command:"git push",beforeCommand:"git clone; git commit"}},{type:"ModalAlert",options:{markdowns:["Pour finir ce niveau, partagez simplement deux nouveaux commits avec le dépôt distant. Accrochez-vous, parce que ces leçons vont devenir beaucoup plus difficiles !"]}}]},es_AR:{childViews:[{type:"ModalAlert",options:{markdowns:["## git push","","Ok, entonces ya bajé los cambios de un repositorio remoto y los integré en mi trabajo localmente. Esto es genial y todo... pero ¿cómo comparto _mis_ cambios con el resto?","","Bueno, la forma de subir el trabajo compartido es la opuesta a cómo descargar trabajo. Y ¿qué es lo opuesto a `git pull`? ¡`git push`!","","`git push` es el responsable de subir _tus_ cambios a un remoto específico y de actualizar ese remoto para incluir tus nuevos commits. Cuando `git push` termina, todos tus amigos pueden descargar tu trabajo del remoto.","",'Podés pensar en `git push` como un comando para "publicar" tu trabajo. Tiene un par de sutilezas con las que vamos a meternos pronto, pero empecemos de a poco.']}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Acá tenemos algunos cambios que nuestro remoto no tiene. ¡Subámoslos!"],afterMarkdowns:["Ahí está: el remoto recibió el commit `C2`, la rama `master` de ese remoto se actualizó para apuntar a `C2`, y nuestro *propio* reflejo del remoto (`o/master`) también fue actualizado. ¡Todo está en sincronía!"],command:"git push",beforeCommand:"git clone; git commit"}},{type:"ModalAlert",options:{markdowns:["Para completar este nivel, simplemente compartí dos nuevos commits con el remoto. Igual, no te confíes, ¡ya se van a complicar las lecciones!"]}}]},es_ES:{childViews:[{type:"ModalAlert",options:{markdowns:["## git push","","Entendido, entonces ya descargué los cambios de un repositorio remoto y los integré en mi trabajo localmente. Esto suena muy bien... pero ¿cómo comparto _mis_ cambios con el resto?","","Bueno, la forma de subir el trabajo compartido es la opuesta a cómo descargar trabajo. Y ¿qué es lo opuesto a `git pull`? ¡`git push`!","","`git push` es el responsable de subir _tus_ cambios a un remoto específico y de actualizar ese remoto para incluir tus nuevos commits. Cuando `git push` termina, todos tus amigos pueden descargar tu trabajo del remoto.","",'Puedes imaginarte `git push` como un comando para "publicar" tu trabajo. Tiene un par de sutilezas con las que vamos a meternos pronto, pero empecemos poco a poco.']}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Aquí tenemos algunos cambios que nuestro remoto no tiene. ¡Subámoslos!"],afterMarkdowns:["Ahí está: el remoto recibió el commit `C2`, la rama `master` de ese remoto se actualizó para apuntar a `C2`, y nuestro *propio* reflejo del remoto (`o/master`) también fue actualizado. ¡Todo está en sincronía!"],command:"git push",beforeCommand:"git clone; git commit"}},{type:"ModalAlert",options:{markdowns:["Para completar este nivel, simplemente comparte dos nuevos commits con el remoto. Igualmente, no te confíes, ¡las lecciones van a empezar a complicarse!"]}}]},pt_BR:{childViews:[{type:"ModalAlert",options:{markdowns:["## Git Push","","Ok, então vimos como baixar mudanças do repositório remoto e incorporá-las à árvore local. Isso é ótimo e tal... mas como eu faço para compartilhar o _meu_ trabalho sensacional com as outras pessoas?","","Bem, a forma de subir trabalho a ser compartilhado é a oposta daquela de baixar trabalho que foi compartilhado. E qual o oposto de `git pull` (puxar)? É `git push` (empurrar)!","","O `git push` é responsável por subir as _suas_ mudanças para um repositório remoto especificado, e atualizar esse remoto para incorporar seus novos commits. Uma vez que o `git push` se completa, todos os seus amigos podem baixar o seu trabalho do repositório remoto.","",'Você pode pensar no `git push` como um comando para "publicar" o seu trabalho. Ele tem uma série de nuances que vamos abordar em breve, mas comecemos com passos curtos...',"","*Nota -- o comportamento de `git push` sem argumentos varia dependendo da configuração `push.default` do Git. O valor padrão para essa configuração depende da versão do Git que você estiver usando, mas vamos assumir o valor `upstream` nestas lições. Isso não é um grande problema, mas vale a pena verificar suas configurações antes de fazer push nos seus próprios projetos.*"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Aqui temos algumas mudanças que o repositório remoto não contém. Vamos subi-las!"],afterMarkdowns:["Aqui vamos nós -- o repositório remoto recebeu o commit `C2`, o ramo `master` no repositório remoto foi atualizado para apontar para `C2`, e a *nossa* reflexão do remoto (`o/master`) foi atualizada também. Está tudo sincronizado!"],command:"git push",beforeCommand:"git clone; git commit"}},{type:"ModalAlert",options:{markdowns:["Para completar este nível, simplesmente compartilhe dois novos commits com o repositório remoto. No entanto, segure-se no seu assento, pois estas lições estão prestes a ficar mais difíceis!"]}}]},gl:{childViews:[{type:"ModalAlert",options:{markdowns:["## Git Push","","Ok, entón xa baixamos os cambios dun repositorio remoto e integrámolos na árbore local. Esto está xenial... pero ¿cómo comparto o _meu_ sensacional traballo cas outras persoas?","","Ben, a forma de subir traballo para ser compartido é a oposta daquela de baixar o traballo que foi compartido. E ¿qué é o oposto a  `git pull` (tirar)? ¡É `git push` (empuxar)!","","`git push` é o responsable de subilos _teus_ cambios para un repositorio remoto especificado, e atualizar ese repositorio remoto para incorporar os seus novos commits. Unha vez que `git push` complétase, todos os teus amigos poderán baixar o teu traballo do repositorio remoto.","",'Podes pensar en `git push` como un comando para "publicar" o teu traballo. O comando ten unha serie de detalles cos que imos xogar logo, pero comezemos con pasos curtos...',"","*Nota -- o comportamento de `git push` sen argumentos varía dependendo da configuración `push.default` de Git. O valor para esa configuración depende da versión de Git que esteas empregando, pero imos asumir o valor `upstream` nestas leccións. Eso non é un gran problema, pero paga a pena verificalas súas configuracións antes de facer push nos teus propios proxectos.*"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Aquí temos algúns cambios que o repositorio remoto non contén. ¡Imos subilas!"],afterMarkdowns:["Ahí imos -- o repositorio remoto recibiu o commit `C2`, a rama `master` do repositorio remoto foi actualizado para apuntar para `C2`, e o *noso* reflexo do remoto (`o/master`) foi atualizado tamén. ¡Está todo sincronizado!"],command:"git push",beforeCommand:"git clone; git commit"}},{type:"ModalAlert",options:{markdowns:["Para completar este nivel, comparte dous novos commits co repositorio remoto. Igual, non te confíes, ¡xa se  complicará nas seguintes leccións!"]}}]},zh_TW:{childViews:[{type:"ModalAlert",options:{markdowns:["## Git Push","","ok，現在我已經從 remote 下載了一些更新，並且把它們 merge 到我的 local 上面的 branch，這聽起來實在太讚了...，但是我要如何分享_我_所做的更新給其它人呢？","","喔，其實上傳並且分享更新跟下載更新並且 merge 是相反的兩件事情，那什麼是 `git pull` 的相反呢？ 那就是 `git push`！","","`git push` 負責上傳_你的_ commit 到特定 remote 上面並且做出相對應的更新，只要做完了 `git push`，所有你的朋友都可以從 remote 上面下載你所送出去的 commit。","",'你可以把 `git push` 當作是一個"發佈"你的工作進度的指令，還有一些我們即將要講到的細節，但是先讓我們從一些簡單的步驟開始。']}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["這裡我們有了一些 remote 所沒有的 commit。讓我們來上傳它們吧！"],afterMarkdowns:["我說的沒錯吧！remote 收到了 commit `C2`，同時在 remote 上的 `master` branch 也一起更新並且指向 `C2`，同時我們*自己的* `o/master` 也一併更新了！"],command:"git push",beforeCommand:"git clone; git commit"}},{type:"ModalAlert",options:{markdowns:["要完成這個關卡，只要上傳兩個新的 commit 給 remote，不要太得意忘形喔！因為這些課程將會愈來愈難！"]}}]},zh_CN:{childViews:[{type:"ModalAlert",options:{markdowns:["## Git Push","","OK，我们已经学过了如何从远程仓库获取更新并合并到本地的分支当中。这非常棒……但是我如何与大家分享**我的**成果呢？","","嗯，上传自己分享内容与下载他人的分享刚好相反，那与 `git pull` 相反的命令是什么呢？`git push`！","","`git push` 负责将**你的**变更上传到指定的远程仓库，并在远程仓库上合并你的新提交记录。一旦 `git push` 完成, 你的朋友们就可以从这个远程仓库下载你分享的成果了！","","你可以将 `git push` 想象成发布你成果的命令。它有许多应用技巧，稍后我们会了解到，但是咱们还是先从基础的开始吧……","","*注意 —— `git push` 不带任何参数时的行为与 Git 的一个名为 `push.default` 的配置有关。它的默认值取决于你正使用的 Git 的版本，但是在教程中我们使用的是 `upstream`。","这没什么太大的影响，但是在你的项目中进行推送之前，最好检查一下这个配置。*"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["这里我们准备了一些远程仓库中没有的提交记录, 咱们开始先上传吧!"],afterMarkdowns:["过去了, 远程仓库接收了 `C2`，远程仓库中的 `master` 分支也被更新到指向 `C2` 了，我们的远程分支 (o/master) 也同样被更新了。所有的分支都同步了！"],command:"git push",beforeCommand:"git clone; git commit"}},{type:"ModalAlert",options:{markdowns:["要完成本关，需要向远程仓库分享两个提交记录。拿出十二分精神吧，后面的课程还会更难哦！"]}}]},de_DE:{childViews:[{type:"ModalAlert",options:{markdowns:["## Git Push","","Nun hab ich also Änderungen vom entfernten Server geholt und in meine lokale Arbeit integriert. Das ist schön und gut ... aber wie teile ich _meine_ Wahnsinns-Entwicklungen mit allen anderen?","","Naja, das Hochladen von Zeug ist das Gegenteil zum Herunterladen von Zeug. Und was ist das Gegenteil von `git pull`? Genau, `git push`!","","`git push` ist dafür verantwortlich _deine_ Änderungen zu einem bestimmten entfernten Server hochzuladen und dort zu integrieren. Sobald das `git push` durch ist, können alle deine Freunde diese Änderungen zu sich herunterladen.","",'Du kannst dir `git push` als einen Befehl zum "Veröffentlichen" deiner Arbeit vorstellen. Es gibt da noch ein paar Feinheiten, aber lass uns mal mit kleinen Schritten anfangen.']}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Hier haben wir ein paar Änderungen, die auf dem Remote noch fehlen. Und hoch damit!"],afterMarkdowns:["Na bitte -- das Remote hat den Commit `C2` bekommen, der `master` auf dem Remote ist entsprechend aktualisiert worden und unsere *eigene* Abbildung des `master` auf dem Remote namens `o/master` wurde auch aktualisiert. Alles im Lot!"],command:"git push",beforeCommand:"git clone; git commit"}},{type:"ModalAlert",options:{markdowns:["Um diesen Level zu schaffen musst du einfach nur zwei neue Commits auf das Remote bringen. Aber stell dich schon mal darauf ein, dass die nächsten Level anspruchsvoller werden!"]}}]},ru_RU:{childViews:[{type:"ModalAlert",options:{markdowns:["## Git Push","","Хорошо, мы скачали изменения с удалённого репозитория и включили их в наши локальные наработки. Всё это замечательно, но как нам поделиться _своими_ наработками и изменениями с другими участниками проекта?","","Способ, которым мы воспользуемся, является противоположным тому способу, которым мы пользовались ранее для скачивания наработок (`git pull`). Этот способ - использование команды `git push`!","","Команда `git push` отвечает за загрузку _ваших_ изменений в указанный удалённый репозиторий, а также включение ваших коммитов в состав удалённого репозитория. По окончании работы команды `git push` все ваши друзья смогут скачать себе все сделанные вами наработки.","",'Вы можете рассматривать команду `git push` как "публикацию" своей работы. Эта команда скрывает в себе множество тонкостей и нюансов, с которыми мы познакомимся в ближайшее время, а пока что давайте начнём с малого...',"","*замечание - поведение команды `git push` без аргументов варьируется в зависимости от значения `push.default`, указанной в настройках git-а. Значение по умолчанию зависит от версии git, которую вы используете, однако в наших уроках мы будем использовать значение `upstream`. Лучше всегда проверять эту опцию прежде чем push-ить ваши настоящие проекты.*"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Здесь у нас имеются изменения, которых нет в удалённом репозитории. Давайте же закачаем их туда!"],afterMarkdowns:["Вот так - удалённый репозиторий получил новый коммит `C2`, ветка `master` на удалённом репозитории теперь указывает на `C2`, и наше *собственное* локальное отображение удалённого репозитория (`o/master`) изменилось соответственно. Всё синхронизировалось!"],command:"git push",beforeCommand:"git clone; git commit"}},{type:"ModalAlert",options:{markdowns:["Чтобы выполнить задачу этого упражнения, просто поделитесь своими двумя новыми коммитами с удалённым репозиторием. Соберитесь, потому что все последующие уроки будут намного сложнее предыдущих!"]}}]},ja:{childViews:[{type:"ModalAlert",options:{markdowns:["## Git Push","","さて、私たちは変更をリモートからダウンロードしてきて、ローカルの自分の作業に取り込むことができるようになりました。それは素晴らしいことですが、例えば他の誰かに_自分の_作業を共有する場合はどうすればいいでしょう？","","そうですね、共有する作業をアップロードする方法は作業をダウンロードするものと対照的です。`git pull`の反対はなんでしょう？ `git push`です！","","`git push`は_あなたの_変更をリモートに対話的にアップロードし、リモートにあなたの新しい変更を取り込みます。`git push`が完了すれば、全ての友人たちがあなたの作業をリモートからダウンロードすることができます。","","`git push`は、あなたの作業を「公開する」コマンドと考えることができます。このコマンドは微妙な点をいくつか持っていますが、とりあえずは初歩から始めてみましょう。。。","","*注：引数なしの`git push`の挙動は、`push.default`と呼ばれるgitの設定値によって異なります。この設定のデフォルト値は、使用しているgitのバージョンに依存しますが、私たちのレッスンでは`upstream`という値を使用します。これはあまり大きな問題ではありませんが、あなたのプロジェクトにプッシュする前にあなたのgitの設定を確認する価値はあるでしょう。*"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["ここにリモートにはないいくつかの変更点があります。これをアップロードしてみましょう！"],afterMarkdowns:["さて、いってみましょう -- リモートはコミット`C2`を受け取り、リモート上の`master`ブランチは`C2`の位置に更新され、私たち*自身*のリモートブランチ(`o/master`)も良い具合に更新されました。全てが同期されました！"],command:"git push",beforeCommand:"git clone; git commit"}},{type:"ModalAlert",options:{markdowns:["このレベルを終えるには、単純に二つの新しいコミットをリモートに共有してください。けれども覚悟しておいてください。なぜなら、レッスンは少々難しいことを取り扱っているからです。"]}}]},uk:{childViews:[{type:"ModalAlert",options:{markdowns:["## Git Push","","Гаразд, я витягнув останні зміни та інтегрував їх до своїх локальних напрацювань. Все добре... але як мені поділится _своїми_ змінами з рештою учасників?","","Отже, надсилання данних є, по-суті, протилежним звантажуванню данних. А який антонім до `git pull` (притягнути)? `git push` (відштовхнути)!","","`git push` використовується для надсилання _локальних_ змін на вказаний віддалений репозиторій; ця команда оновлює віддалений репозиторій, інтегруючи нові коміти. Після виконання `git push` всі твої друзі зможуть звантажити твої напрацювання з віддаленого сховища.","",'Ти можеш вважати, що `git push` "публікує" твої напрацювання. В цієї команди є кілька особливостей, які ми скоро розглянемо, але почнімо з початку...',"","*Зауваження: поведінка `git push` без параметрів різниться в залежності від налаштування git з назвою `push.default`. Значення за замовчуванням цього налаштування залежить від версії твого git, але в наших уроках ми будемо вважати що воно дорівнює `upstream`. Це не вкрай важливо, але буде корисно перевірити це налаштування перед тим як пушити свій проект.*"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Ось ми маємо деякі зміни яких нема в віддаленому сховищі. Надішлімо їх!"],afterMarkdowns:["Ось, маєш -- віддалене сховище отримало  `C2`, гілку `master` на ньому було оновлено й тепер вона посилається на `C2`, а наше *власне* відображення віддаленого репо  (`o/master`) було також оновлено. Все синхронізовано!"],command:"git push",beforeCommand:"git clone; git commit"}},{type:"ModalAlert",options:{markdowns:["Щоб пройти цей рівень, просто надішли два коміти у віддалений репозиторій. Але прищібнись, скоро наші уроки стануть значно важчими!"]}}]},ko:{childViews:[{type:"ModalAlert",options:{markdowns:["## Git Push","","좋아요, 원격 저장소에서의 변화들을 가져오는 방법도 알고 로컬의 내 작업과 합칠줄도 알게되었습니다. 아주 좋아요.. 좋은데 이제 _나의_ 훌륭한 작업을 다른 사람들과 공유하려면 어떻게 해야되는거죠?","","공유된 작업을 내려받는것의 반대는 작업을 업로드해 공유하는것입니다. 그렇다면 `git pull` 당기기의 반대는? `git push` 미는겁니다!","","`git push`는 _여러분의_변경을 정한 원격저장소에 업로드하고 그 원격 저장소가 여러분의 새 커밋들을 합치고 갱신하게 합니다. `git push`가 끝나고 나면, 여러분의 친구들은 원격저장소에서 여러분의 작업을 내려받을수 있게됩니다.","",'여러분은 `git push`를 작업을 "공개"하는 과정이라고 생각해도 될것입니다. 곧 알아볼 중요한 세부 요소들이 잔뜩 있지만, 일단은 아기 걸음으로 시작해봅시다...',"","*노트 -- `git push`를 매개변수 없이 사용하는 디폴트 행동은 `push.default`라 불리는 git의 설정에 따라 결정 됩니다. 이 설정의 기본값은 여러분이 사용하는 git 버전에 따라 다릅니다만, 우리 강의에서는 `upstream`을 값으로 사용합니다. 대단한것은 아니지만, 여러분이 프로젝트를 push하기전에 한번쯤 확인해볼 가치가 있습니다.*"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["여기 원격저장소에는 없는 변경이 있습니다. 이것들을 업로드 해 봅시다!"],afterMarkdowns:["자 됬습니다 -- 원격 저장소가 커밋 `C2`를 받았고, 원격 저장소의 브랜치 `master`가 `C2`라는 지점까지 갱신 되었습니다. 그리고 원격 저장소의 반영인 *우리의* 원격 브랜치 (`o/master`)또한 잘 갱신 되었습니다. 모든게 동기화되어 있습니다!"],command:"git push",beforeCommand:"git clone; git commit"}},{type:"ModalAlert",options:{markdowns:["이번 레벨을 마치기 위해, 두개의 새 커밋을 원격 저장소에 공유해봅시다. 마음의 준비를 단단히 하세요, 이제부터 강의들이 훨씬 어려워질거니까요!"]}}]},vi:{childViews:[{type:"ModalAlert",options:{markdowns:["## Git Push","","Được rồi, ta đã biết cách nạp thay đổi từ kho chứa từ xa và kết hợp chúng vào các nhánh cục bộ. Khá là tuyệt rồi... nhưng nếu tôi muốn chia sẻ tác phẩm tuyệt vời _của tôi_ với mọi người khác thì sao?","","Chà, cách tải lên thì phải ngược với tải xuống rồi. Vậy thì đối nghịch của `git pull`(kéo) là gì? `git push`(đẩy)!","","`git push` có trách nhiệm tải lên thay đổi _của bạn_ vào nhánh từ xa được chỉ định và cập nhật nhánh đó để kết hợp với commit đẩy lên của bạn. Một khi lệnh `git push` hoàn thành, tất cả bạn bè của bạn có thể tải xuống thay đổi của nhánh từ xa đó đó.","",'Bạn có thể xem `git push` là câu lệnh để "xuất bản" thành quả công việc của bạn. Lệnh này có nhiều tính năng tinh tế mà ta sẽ tìm hiểu nhanh thôi, nhưng giờ hãy cứ bắt đầu với từng bước nhỏ đã...',"","*lưu ý --`git push` mà không có tham số hành xử tùy biến phụ thuộc vào cài đặt của git là `push.default`. Giá trị mặc định cho cài đặt này phụ thuộc vào phiên bản git mà bạn đang sử dụng, còn ở bài học của chúng ta thì ta sẽ sử dụng giá trị `upstream` (ngược dòng). Bây giờ thì đó chưa phải là vấn đề gì lớn, nhưng chúng tôi khuyến nghị bạn kiểm tra cài đặt của mình trước khi đẩy lên dự án của bạn.*"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Ở đây ta có một vài thay đổi mà kho chứa từ xa không có. Hãy tải chúng lên!"],afterMarkdowns:["Đó -- kho chứa từ xa đã nhận được commit `C2`, nhánh `master` ở kho chứa từ xa đã được cập nhật lên `C2`, và phản chiếu nhánh từ xa *của ta* (`o/master`) cũng được cập nhật luôn. Mọi thứ đã đồng bộ!"],command:"git push",beforeCommand:"git clone; git commit"}},{type:"ModalAlert",options:{markdowns:["Để hoàn thành cấp độ này, đơn giản là hãy chia sẻ 2 commit mới với kho chứa từ xa. Chuẩn bị tinh thần nhé, vì các bài học sẽ khó dần lên nhiều đấy!"]}}]}}}},{}],141:[function(e,t,o){o.level={goalTreeString:'{"branches":{"master":{"target":"C2","id":"master","remoteTrackingBranchID":"o/master"},"foo":{"target":"C3","id":"foo","remoteTrackingBranchID":"o/foo"},"o/master":{"target":"C2","id":"o/master","remoteTrackingBranchID":null},"o/foo":{"target":"C3","id":"o/foo","remoteTrackingBranchID":null}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"},"C2":{"parents":["C1"],"id":"C2"},"C3":{"parents":["C1"],"id":"C3"}},"HEAD":{"target":"C0","id":"HEAD"},"originTree":{"branches":{"master":{"target":"C2","id":"master","remoteTrackingBranchID":null},"foo":{"target":"C3","id":"foo","remoteTrackingBranchID":null}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"},"C2":{"parents":["C1"],"id":"C2"},"C3":{"parents":["C1"],"id":"C3"}},"HEAD":{"target":"master","id":"HEAD"}}}',solutionCommand:"git push origin master;git push origin foo",startTree:'{"branches":{"master":{"target":"C2","id":"master","remoteTrackingBranchID":"o/master"},"foo":{"target":"C3","id":"foo","remoteTrackingBranchID":"o/foo"},"o/master":{"target":"C1","id":"o/master","remoteTrackingBranchID":null},"o/foo":{"target":"C1","id":"o/foo","remoteTrackingBranchID":null}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"},"C2":{"parents":["C1"],"id":"C2"},"C3":{"parents":["C1"],"id":"C3"}},"HEAD":{"target":"C0","id":"HEAD"},"originTree":{"branches":{"master":{"target":"C1","id":"master","remoteTrackingBranchID":null},"foo":{"target":"C1","id":"foo","remoteTrackingBranchID":null}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"}},"HEAD":{"target":"master","id":"HEAD"}}}',disabledMap:{"git checkout":!0},name:{en_US:"Git push arguments",zh_CN:"Git push 的参数",zh_TW:"git push 的參數",es_AR:"Parámetros de git push",es_ES:"Parámetros de git push",pt_BR:"Parâmetros do git push",gl:"Parámetros de git push",de_DE:"Optionen für Git Push",ja:"Git pushの引数",fr_FR:"Arguments de git push",ru_RU:"Аргументы git push",ko:"git push의 인자들",uk:"Аргументи git push",vi:"Tham số git push"},hint:{en_US:'You can always look at the last slide of the dialog with "objective"',zh_CN:"你可以利用“objective”来阅读对话窗口的最后一页",zh_TW:'你可以利用 "objective" 來閱讀對話視窗的最後一頁',es_AR:'Siempre podés ver el último mensaje tipeando "objective"',es_ES:'Siempre puedes ver el último mensaje escribiendo "objective"',pt_BR:'Você sempre pode rever o último slide com o comando "objective"',gl:'Ti sempre podes desfacer último mensaxe escribindo "objective"',de_DE:'Du kannst dir die Zielsetzung des Levels immer wieder mit "objective" anzeigen lassen',ja:'ダイアログの最後のスライドを参照するには"objective"を実行',fr_FR:'Vous pouvez toujours regarder le dernier slide des dialogues en tapant "objective".',ru_RU:'Вы всегда можете ознакомиться с последним слайдом, воспользовавшись "objective".',ko:'대화창의 마지막 슬라이드를 "objective"로 다시 볼 수 있습니다.',uk:'Завжди можна подивитися останній слайд діалогу за допомогою "objective"',vi:'Bạn có thể sử dụng "objective" để đọc trang cuối của cửa sổ hộp thoại'},startDialog:{en_US:{childViews:[{type:"ModalAlert",options:{markdowns:["## Push arguments","","Great! Now that you know about remote tracking branches we can start to uncover some of the mystery behind how git push, fetch, and pull work. We're going to tackle one command at a time but the concepts between them are very similar.","",'First we\'ll look at `git push`. You learned in the remote tracking lesson that git figured out the remote *and* the branch to push to by looking at the properties of the currently checked out branch (the remote that it "tracks"). This is the behavior with no arguments specified, but git push can optionally take arguments in the form of:',"","`git push <remote> <place>`","",""]}},{type:"ModalAlert",options:{markdowns:["What is a `<place>` parameter you say? We'll dive into the specifics soon, but first an example. Issuing the command:","","`git push origin master`","","translates to this in English:","",'*Go to the branch named "master" in my repository, grab all the commits, and then go to the branch "master" on the remote named "origin". Place whatever commits are missing on that branch and then tell me when you\'re done.*',"",'By specifying `master` as the "place" argument, we told git where the commits will *come from* and where the commits *will go*. It\'s essentially the "place" or "location" to synchronize between the two repositories.',"","Keep in mind that since we told git everything it needs to know (by specifying both arguments), it totally ignores where we are checked out!"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Let's see an example of specifying the arguments. Note the location where we are checked out in this example."],afterMarkdowns:["There we go! `master` got updated on the remote since we specified those arguments."],command:"git checkout C0; git push origin master",beforeCommand:"git clone; git commit"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["What if we hadn't specified the arguments? What would happen?"],afterMarkdowns:["The command fails (as you can see), since `HEAD` is not checked out on a remote-tracking branch."],command:"git checkout C0; git push",beforeCommand:"git clone; git commit"}},{type:"ModalAlert",options:{markdowns:["Ok, for this level let's update both `foo` and `master` on the remote. The twist is that `git checkout` is disabled for this level!","","*Note: The remote branches are labeled with `o/` prefixes because the full `origin/` label does not fit in our UI. Don't worry ","about this... simply use `origin` as the name of the remote like normal.*"]}}]},fr_FR:{childViews:[{type:"ModalAlert",options:{markdowns:["## Les arguments de push","","Bien ! Maintenant que vous connaissez le suivi des branches, nous pouvons fouiller ce qui se cache derrière le fonctionnement de push, fetch, et pull. Nous allons aborder une commande à la fois, mais elles sont très similaires.","","En premier lieu regardons `git push`. Vous avez appris dans la leçon sur le suivi des branches distantes que git détermine le dépôt distant *et* la branche à envoyer en regardant les propriétés de la branche courante (c'est à dire la branche distante que cette dernière \"suit\" -- track). C'est le comportement rencontré quand aucun argument n'est spécifié, mais git push accepte aussi des arguments de la forme :","","`git push <remote> <place>`","",""]}},{type:"ModalAlert",options:{markdowns:["Qu'est ce que ce paramètre `<place>` ? Avant de passer à l'explication, voyons d'abord un exemple. La commande suivante :","","`git push origin master`","","peut se traduire en français par :","",'*Va dans la branche "master" de mon dépôt, récupère tous les commits, et ensuite va dans la branche distante "master" sur le dépôt nommé "origin". Envoie tous les commits qui lui manquent sur cette branche distante puis préviens-moi quand c\'est terminé.*',"","En spécifiant `master` comme argument `<place>`, nous avons dit à git *d'où* les commits venaient et où ils *allaient*. C'est en fait \"l'emplacement\" à synchroniser entre les deux dépôts.","","Gardez à l'esprit que nous avons dit à git tout ce dont il a besoin pour opérer (en précisant les deux arguments), il n'a donc absolument pas besoin de savoir quelle est la branche courante !"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Voyons un exemple d'arguments. Notez bien où se trouve `HEAD` dans cet exemple."],afterMarkdowns:["Voilà ! `master` a été mise à jour puisque nous avons spécifié ces arguments."],command:"git checkout C0; git push origin master",beforeCommand:"git clone; git commit"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Et si nous n'avions pas mis d'arguments ? Que ce serait-il passé ?"],afterMarkdowns:["La commande échoue (comme vous pouvez le voir), car `HEAD` ne se trouve pas sur une branche configurée pour suivre une branche distante."],command:"git checkout C0; git push",beforeCommand:"git clone; git commit"}},{type:"ModalAlert",options:{markdowns:["Ok, pour ce niveau mettez à jour `foo` et `master` sur le dépôt distant. La difficulté est que `git checkout` est désactivée pour ce niveau !"]}}]},es_AR:{childViews:[{type:"ModalAlert",options:{markdowns:["## Parámetros de push","","¡Genial! Ahora que sabés acerca de las ramas que trackean remotos podemos empezar a desvelar algo del misterio detrás de git push, fetch y pull. Vamos a atacar de a un comando a la vez, pero los conceptos entre ellos son muy similares.","",'Veamos primero `git push`. Ya aprendiste en la lección sobre ramas remotas que git determinó el remoto *y* la rama a la que pushear mirando las propiedades de la rama actual (el remoto al que "trackea"). Este es el comportamiento default para cuando no se especifican parámetros, pero git push toma, opcionalmente, parámetros de la forma:',"","`git push <remoto> <lugar>`","",""]}},{type:"ModalAlert",options:{markdowns:["¿Qué será este parámetro `<lugar>`, te preguntarás? Ya vamos a entrar en detalle, pero primero un ejemplo. Correr el comando:","","`git push origin master`","","se traduce así al español:","",'*Andá a la rama llamada "master" en mi repositorio, agarrá todos los commits, y después andá a la rama "master" del remoto llamado "origin". Aplicá ahí todos los commits que falten, y avisame cuando termines.*',"",'Especificando `master` como el parámetro "lugar", le dijimos a git de dónde traer los commits, y a dónde mandarlos. Es, básicamente, el "lugar" o "ubicación" que sincronizar entre ambos repositorios.',"","Tené en cuenta que, como le dijimos a git todo lo que necesitaba saber (especificando ambos parámetros), ¡ignora totalmente dónde estamos parados en este momento¡"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Veamos un ejemplo especificando los parámetros. Notá en dónde estamos parados en este ejemplo."],afterMarkdowns:["¡Ahí está! Se actualizó `master` en el remoto, porque especificamos esos parámetros."],command:"git checkout C0; git push origin master",beforeCommand:"git clone; git commit"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["¿Y si no especificabamos los parámetros? ¿Qué hubiera pasado?"],afterMarkdowns:["El comando falla (como podés ver), porque `HEAD` no está sobre ninguna rama que trackee algún remoto."],command:"git checkout C0; git push",beforeCommand:"git clone; git commit"}},{type:"ModalAlert",options:{markdowns:["Ok. Para este nivel, actualicemos tanto `foo` como `master` en el remoto. El tema está en que ¡tenemos deshabilitado `git checkout` en este nivel!"]}}]},es_ES:{childViews:[{type:"ModalAlert",options:{markdowns:["## Parámetros de push","","¡Genial! Ahora que has aprendido sobre las ramas que trackean remotos podemos empezar a desvelar algo del misterio detrás de git push, fetch y pull. Vamos a atacar un comando cada vez, pero los conceptos entre ellos son muy similares.","",'Veamos primero `git push`. Ya aprendiste en la lección sobre ramas remotas que git determinó el remoto *y* la rama a la que pushear mirando las propiedades de la rama actual (el remoto al que "trackea"). Este es el comportamiento por defecto para cuando no se especifican parámetros, pero git push toma, opcionalmente, parámetros de la forma:',"","`git push <remoto> <lugar>`","",""]}},{type:"ModalAlert",options:{markdowns:["¿Qué será este parámetro `<lugar>`, te preguntarás? Vamos a entrar en detalle, pero primero un ejemplo. Ejecutar el comando:","","`git push origin master`","","se traduce así al español:","",'*Vete a la rama llamada "master" en mi repositorio, coge todos los commits, y después vete a la rama "master" del remoto llamado "origin". Copia ahí todos los commits que falten, y avísame cuando termines.*',"",'Especificando `master` como el parámetro "lugar", le dijimos a git de dónde traer los commits, y a dónde mandarlos. Es, básicamente, el "lugar" o "ubicación" que sincronizar entre ambos repositorios.',"","Ten en cuenta que, como le dijimos a git todo lo que necesitaba saber (especificando ambos parámetros), ¡ignora totalmente dónde estamos parados en este momento¡"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Veamos un ejemplo especificando los parámetros. Date cuenta dónde estamos parados en este ejemplo."],afterMarkdowns:["¡Ahí está! Se actualizó `master` en el remoto, porque especificamos esos parámetros."],command:"git checkout C0; git push origin master",beforeCommand:"git clone; git commit"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["¿Y si no especificabamos los parámetros? ¿Qué hubiera pasado?"],afterMarkdowns:["El comando falla (como puedes ver), porque `HEAD` no está sobre ninguna rama que apunte a algún remoto."],command:"git checkout C0; git push",beforeCommand:"git clone; git commit"}},{type:"ModalAlert",options:{markdowns:["Perfecto. Para este nivel, actualicemos tanto `foo` como `master` en el remoto. El tema está en que ¡tenemos deshabilitado `git checkout` en este nivel!"]}}]},pt_BR:{childViews:[{type:"ModalAlert",options:{markdowns:["## Parâmetros do push","","Ótimo! Agora que você sabe sobre remote tracking de ramos, podemos começar a revelar um pouco do mistério por trás de como o push, o fetch e o pull funcionam. Vamos lidar com um comando por vez, mas os conceitos são bastante similares.","",'Primeiro, vamos abordar o `git push`. Você aprendeu na lição sobre remote tracking que o Git descobria o repositório remoto *e* o ramo correspondente onde fazer o push olhando nas propriedades do ramo que está atualmente em checkout (verificando o ramo remoto que ele "segue"). Este é o comportamento quando nenhum parâmetro é especificado, mas o git push pode opcionalmente receber parâmetros na seguinte forma:',"","`git push <repositório remoto> <lugar>`","",""]}},{type:"ModalAlert",options:{markdowns:["Você deve estar se perguntando: o que é esse parâmetro `<lugar>`? Vamos discutir as especifidades em breve, mas vejamos primeiro um exemplo. Executar o comando:","","`git push origin master`","","pode ser traduzido para o seguinte em Português:","",'*Vá ao ramo chamado "master" no meu repositório local, pegue todos os commits, então vá ao ramo "master" no repositório remoto chamado "origin". Coloque quaisquer commits que estiverem faltando nesse ramo, e então me diga quando estiver pronto.*',"",'Especificando `master` como parâmetro "lugar", dizemos ao Git de onde os commits *vão vir* e para onde os commits *irão*. É essencialmente o "lugar" onde sincronizar entre os dois repositórios.',"","Tenha em mente que já que contamos ao Git tudo que ele precisa saber (especificando ambos os parâmetros), ele ignora totalmente o checkout atual!"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Vejamos um exemplo especificando os argumentos. Preste atenção no commit que sofreu checkout neste exemplo."],afterMarkdowns:["Aqui vamos nós! O `master` foi atualizado no repositório remoto, já que especificamos os parâmetros."],command:"git checkout C0; git push origin master",beforeCommand:"git clone; git commit"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["E se eu não especificasse parâmetros? O que aconteceria?"],afterMarkdowns:["O comando falha (como você pode ver), já que o `HEAD` não havia sofrido checkout para um ramo com propriedade de remote-tracking definida."],command:"git checkout C0; git push",beforeCommand:"git clone; git commit"}},{type:"ModalAlert",options:{markdowns:["Ok, neste nível vamos atualizar tanto o `foo` como o `master` no repositório remoto. Porém desabilitamos o comando `git checkout` para dificultar um pouco a tarefa!"]}}]},gl:{childViews:[{type:"ModalAlert",options:{markdowns:["## Parámetros de push","","¡Xenial! Agora que sabes acerca das ramas que seguen remotos, podemos empezas a desvelar algo do misterio detrás do git push, fetch e pull. Imos atacar cun só comando dunha vez, pero os conceptos entre eles son moi semellantes.","","Vexamos primeiro `git push`. Xa aprendiches na lección sobre as ramas remotas que git determina o remoto *e* a rama á que empurrar mirando as propiedades da rama actual (o remoto ó que seguir). Este é o comportamento por defecto para  cando non se especifican parámetros, pero git push toma, opcionalmente, parámetros da forma:","","`git push <remoto> <lugar>`","",""]}},{type:"ModalAlert",options:{markdowns:["¿Qué será este parámetro `<lugar>`, fixécheste esa pregunta? Xa imos entrar en detalle, pero primeiro un exemplo. Executa o comando:","","`git push origin master`","","tradúcese así ó galego:","",'*Vai á rama chamada "master" no meu repositorio, colle tódolos commits, e despois vai á rama "master" do remoto chamado "origin". Aplica ahí tódolos commits que falten, e avísame cando remates.*',"",'Indicando `master` como o parámetro "lugar", dixémoslle a git ónde traer os commits, e ónde mandalos. É básicamente, o "lugar" ou "ubicación" que sincroniza entre ámbolos dous repositorios.',"","Ten en conta que, como lle dixemos a git todo o que precisaba saber (indicando ambos parámetros), ¡ignora totalmente ónde andabamos neste momento!"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Vexamos un exemplo especificando os parámetros. Nota ónde ficamos parados neste exemplo."],afterMarkdowns:["¡Ahí o tes! Actualizouse `master` no remoto, porque especificamos eses parámetros."],command:"git checkout C0; git push origin master",beforeCommand:"git clone; git commit"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["¿E se non especificáramos os parámetros? ¿Que ocorrería?"],afterMarkdowns:["O comando falla (como podes ver), xa que `HEAD` non está sobre ningunha rama que siga algún remoto."],command:"git checkout C0; git push",beforeCommand:"git clone; git commit"}},{type:"ModalAlert",options:{markdowns:["Ok. Para este nivel, actualiza tanto `foo` como `master` no remoto. O tema está en que ¡temos deshabilitado `git checkout` neste nivel!"]}}]},zh_TW:{childViews:[{type:"ModalAlert",options:{markdowns:["## push 的參數","","太好了！現在你已經明白了 remote tracking，我們可以開始聊 git push、fetch 以及 pull 的一些有趣的地方，我們一次會講解一個指令，但是它們之間的概念是很類似的。","","首先我們來看一下 `git push`，你已經在 remote tracking 的課程中學習到 git 是根據目前 checkout 的 branch 所 track 的 remote branch 來做 push，這是在沒有任何的參數的情況下的預設動作，但是 git push 允許我們可以加上一些參數：","","`git push <remote> <place>`","",""]}},{type:"ModalAlert",options:{markdowns:["`<place>` 這個參數表示什麼? 我們等一下會提到細節，但是先來看一個例子，執行以下的指令：","","`git push origin master`","","將這段解釋成中文：","",'*先到我的 repo 中的 "master" branch，抓下所有的 commit，然後到叫作 "origin" 的 remote 的 "master" branch，檢查 remote 的 commit 有沒有跟我的 repo 一致，如果沒有，就更新。*',"",'將 `master` 當作 "place" 這個參數，我們告訴 git 這些 commit 是*從哪裡來的*，而且它們要*往哪裡去*。對於要同步兩個 repo， "place" 或者是 "location" 是非常重要的。',"","要記住喔，因為我們告訴 git 它所要知道的（有兩個參數），因此它才不會管你現在所 checkout 的 branch！"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["讓我們來看一個有加上參數的例子，在這個例子中，要特別注意到我們所 checkout 的位置。"],afterMarkdowns:["我說的沒錯吧！因為我們加上了參數，所以在 remote 上的 `master` branch 更新了。"],command:"git checkout C0; git push origin master",beforeCommand:"git clone; git commit"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["假如我們沒有特別指令參數會發生什麼事情？"],afterMarkdowns:["指令會失敗（就像你看到的），因為 `HEAD` 並沒有指向一個有 track remote branch 的 branch 上面阿。"],command:"git checkout C0; git push",beforeCommand:"git clone; git commit"}},{type:"ModalAlert",options:{markdowns:["好的，在這個關卡中，我們要更新在 remote 上的 `foo` 以及 `master` branch，比較遺憾的是 `git checkout` 在這個關卡中是不被允許的喔！"]}}]},zh_CN:{childViews:[{type:"ModalAlert",options:{markdowns:["## Git Push 的参数","","很好! 既然你知道了远程跟踪分支，我们可以开始揭开 git push、fetch 和 pull 的神秘面纱了。我们会逐个介绍这几个命令，它们在理念上是非常相似的。","","首先来看 `git push`。在远程跟踪课程中，你已经学到了 Git 是通过当前检出分支的属性来确定远程仓库以及要 push 的目的地的。这是未指定参数时的行为，我们可以为 push 指定参数，语法是：","","`git push <remote> <place>`","",""]}},{type:"ModalAlert",options:{markdowns:["`<place>` 参数是什么意思呢？我们稍后会深入其中的细节, 先看看例子, 这个命令是:","","`git push origin master`","","把这个命令翻译过来就是：","","*切到本地仓库中的“master”分支，获取所有的提交，再到远程仓库“origin”中找到“master”分支，将远程仓库中没有的提交记录都添加上去，搞定之后告诉我。*","","我们通过“place”参数来告诉 Git 提交记录来自于 master, 要推送到远程仓库中的 master。它实际就是要同步的两个仓库的位置。","","需要注意的是，因为我们通过指定参数告诉了 Git 所有它需要的信息, 所以它就忽略了我们所检出的分支的属性！"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["我们看看指定参数的例子。注意下我们当前检出的位置。"],afterMarkdowns:["好了! 通过指定参数, 远程仓库中的 `master` 分支得到了更新。"],command:"git checkout C0; git push origin master",beforeCommand:"git clone; git commit"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["如果不指定参数会发生什么呢?"],afterMarkdowns:["命令失败了（正如你看到的，什么也没有发生）! 因为我们所检出的 HEAD 没有跟踪任何分支。"],command:"git checkout C0; git push",beforeCommand:"git clone; git commit"}},{type:"ModalAlert",options:{markdowns:["本关我们要更新远程仓库中的 `foo` 和 `master`, 但是 `git checkout` 被禁用了！","","*注意：远程分支使用 `o/` 开头是因为 `origin/` 对于 UI 来说太长了。不用太在意这个，直接用 `origin` 作为远程仓库的名称就可以了。*",""]}}]},de_DE:{childViews:[{type:"ModalAlert",options:{markdowns:["## Push-Optionen","","Großartig! Da du dich jetzt mit Remote Tracking Branches auskennst können wir anfangen, die Geheimnisse hinter `git push`, `fetch` und `pull` zu ergründen. Wir werden uns einen Befehl nach dem anderen vornehmen, aber die Funktionsweisen sind sich sehr ähnlich.","",'Zunächst schauen wir uns `git push` an. Du hast im Level über Remote Tracking schon mitbekommen, dass Git den Remote Server *und* den Branch herausbekommt, indem es sich die Eigenschaften des aktuell ausgecheckten Branches ansieht (in denen das Remote steht, das der Branch "trackt"). Das ist das Verhalten bei keiner Angabe weiterer Optionen -- du kannst bei `git push` aber auch folgende setzen:',"","`git push <Remote> <Ort>`","",""]}},{type:"ModalAlert",options:{markdowns:['Was "Ort" sein soll fragst du? Das klären wir später genau, schauen wir uns zunächst ein Beispiel an:',"","`git push origin master`","","Das bedeutet im Klartext:","",'"Geh zum Branch namens `master` in meinem Repository, nimm all seine Commits, dann geh zum Branch `master` auf dem Remote namens `origin`. Leg da alles Commits ab die fehlen und sag mir wenn du fertig bist."',"",'Dadurch, dass wir `master` als "Ort" angegeben haben, weiß Git *woher* die Commits kommen und *wohin* sie sollen. Es ist im Grunde der Name der Orte, die zwischen zwei Repositorys synchronisiert werden soll.',"","Dadurch, dass wir Git alles explizit gesagt haben, was es für die Operation wissen muss (durch Angabe von Remote und Ort) ist es vollkommen egal, was gerade ausgecheckt ist."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Schauen wir uns noch ein Beispiel an. Beachte was in diesem Fall gerade ausgecheckt ist."],afterMarkdowns:["Da haben wir's! `master` wurde auf dem Remote aktualisiert, weil wir beide Optionen angegeben haben."],command:"git checkout C0; git push origin master",beforeCommand:"git clone; git commit"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Was wäre passiert, wenn wir keine Optionen benutzt hätten?"],afterMarkdowns:["Der Befehl schlägt fehlt, da `HEAD` nicht auf einem Branch steht, der ein Remote trackt."],command:"git checkout C0; git push",beforeCommand:"git clone; git commit"}},{type:"ModalAlert",options:{markdowns:["Ok, in diesem Level lass uns sowohl `foo` als auch `master` auf dem Remote aktualisieren. Um's spannender zu machen, ist `git checkout` in diesem Level deaktiviert."]}}]},ru_RU:{childViews:[{type:"ModalAlert",options:{markdowns:["## Аргументы команды Push","","Отлично! Теперь, когда вы знаете, как следить за удалёнными ветками, мы можем начать изучение того, что скрыто под занавесом работы команд git push, fetch и pull. Мы будем рассматривать одну команду за другой, однако принципы у них очень схожи.","","Сперва взглянем на `git push`. В уроке, посвящённом слежению за удалённым репозиторием, вы узнали о том, что git находит удалённый репозиторий *и* ветку, в которую необходимо push-ить, благодаря свойствам текущей ветки, на которой мы находимся. Это так называемое поведение без аргументов, однако команда git push может быть также использована и с аргументами. Вид команды в данном случае:","","`git push <удалённый_репозиторий> <целевая_ветка>`","",""]}},{type:"ModalAlert",options:{markdowns:["Что за такой параметр `<целевая_ветка>`? Мы узнаем об этом через секунду, а пока что рассмотрим пример. Допустим, что мы выполняем такую команду:","","`git push origin master`","","дословный перевод с английского будет таким:","",'*Перейди в ветку с именем "master" в моём локальном репозитории, возьми все коммиты и затем перейди на ветку "master" на удалённом репозитории "origin.". На эту удалённую ветку скопируй все отсутствующие коммиты, которые есть у меня, и скажи, когда ты закончишь.*',"",'Указывая `master` в качестве аргумента "целевая_ветка", мы тем самым говорим git-у откуда будут *приходить* и *уходить* наши коммиты. Аргумент "целевая_ветка" или "местонахождение" - это синхронизация между двумя репозиториями.',"","Имейте в виду, что с тех пор, как мы сказали git-у всё, что ему необходимо (указав оба аргумента), ему - git-у - абсолютно всё равно, что вы зачекаутили до этого!"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Давайте взглянем на пример, в котором указаны оба этих аргумента. Обратите внимание на местоположение, в котором мы находимся после чекаута."],afterMarkdowns:["Вот так! Мы обновили `master` на удалённом репозитории, принудительно указав аргументы в push."],command:"git checkout C0; git push origin master",beforeCommand:"git clone; git commit"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["А что бы было, ели бы мы не указывали эти аргументы, при этом используя тот же алгоритм?"],afterMarkdowns:["Как вы видите, команда не выполнилась, так как `HEAD` потерялся и не находится на удалённо-отслеживаемой ветке."],command:"git checkout C0; git push",beforeCommand:"git clone; git commit"}},{type:"ModalAlert",options:{markdowns:["Хорошо, для выполнения этого уровня давайте обновим обе ветки `foo` и `master` на удалённом репозитории. Фишка в том, что команда `git checkout` не доступна на этом уровне!","","*Замечание: Удалённые ветки помечены как `o/`, а не `origin/`. Дело в том, что полная метка не помещается на экране. Не волнуйтесь ","по этому поводу... просто используйте знакомый нам `origin` для обращения к удалённому репозиторию.*"]}}]},ko:{childViews:[{type:"ModalAlert",options:{markdowns:["## Push의 인자들","","좋습니다! 여러분은 이제 원격 추적 브랜치도 알고 있기 때문에 이제 git push, fetch, pull이 어떻게 작동하는지에 관한 숨겨져있는 미스테리를 풀어나갈 준비가 되었습니다. 한번에 하나의 명령어를 알아보도록하겠는데 이것들이 가지고있는 컨셉은 아주 비슷해요.","",'먼저 `git push`입니다. 여러분은 push를 하면 git이 push를 할 대상으로 원격저장소, 브랜치를 현재 작업중인 브랜치에 설정된 속성("추적" 대상)을 통해 알아낸다는것을 이전 추적 레슨에서 배웠습니다. 이것은 인자를 넣지않고 실행할 때 일어나는것 입니다, 그런데 git push에 다음과 같은 형식으로 선택적으로 인자를 사용할수도 있습니다:',"","`git push <remote> <place>`","",""]}},{type:"ModalAlert",options:{markdowns:["`<place>`인자가 무엇을 의미할것 같나요? 세부사항은 알아보기 전에 예시부터 봅시다. 다음 명령어를 보세요:","","`git push origin master`","","해석해 보면:","",'*내 저장소에 있는 "master"라는 이름의 브랜치로 가서 모든 커밋들을 수집합니다, 그다음 "origin"의 "master"브랜치로 가서 이 브랜치에 부족한 커밋들을 채워 넣고 완료 되면 알려줍니다.*',"",'`master`를 "place"인자로 지정해서 우리가 git에게 *어디서부터* 커밋이 오는지, 그리고 *어디로* 커밋이 가야하는지 알려줍니다. 두 저장소간에 동기화 작업을 할 "장소"를 지정해 주는것이라고 볼 수 있습니다.',"","git이 알아야 할 것은 다 알려줬기 때문에(두 인자를 모두 지정했죠), git은 현재 우리가 체크아웃한 브랜치는 무시하고 명령을 수행합니다."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["인자를 지정해주는 예제를 눈으로 직접 확인해 봅시다. 이 예제에서 우리가 체크아웃한 곳이 어디인지를 주의하며 봅시다."],afterMarkdowns:["됬네요! 지정해준 인자들에 의해 원격 저장소의 `master`가 갱신 되었습니다."],command:"git checkout C0; git push origin master",beforeCommand:"git clone; git commit"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["인자를 지정하지 않으면 어떻게 될까요?"],afterMarkdowns:["명령이 실패하며(보시다시피), `HEAD`가 원격저장소를 추적하는 브랜치에 체크아웃 되있지 않기 때문이죠."],command:"git checkout C0; git push",beforeCommand:"git clone; git commit"}},{type:"ModalAlert",options:{markdowns:["좋습니다, 이번 레벨에서는 원격저장소의 `foo`, `master`브랜치 모두 갱신해봅시다. 이번 문제는 `git checkout`이 비활성화 되있다는 점이 특징이죠!","","*노트: 원격 브랜치들은 `o/`접두어로 분류되어 있습니다. `origin/`으로 생략없이 표현하면 UI에 안맞아서 이렇게 표현했어요. ","그래서... 원격저장소 이름은 원래처럼 `origin`으로 써주세요.*"]}}]},uk:{childViews:[{type:"ModalAlert",options:{markdowns:["## Аргумeнти git push","",'Чудово! А зараз, коли ти знаєш все про відслідковування віддалених гілок, ми можемо розглянути "магію", що відбувається при git push, fetch, і pull. Ми розглянемо лише окремі команди для розуміння загального принципу.',"",'Спочатку розгляньмо `git push`. З уроку про відслідковування віддалених гілок ми знаємо, що git визначає куди і в *яку* гілку робити push, дивлячись на локальну поточну гілку (і віддалену, за якою вона "слідкує"). Це поведінка `push` без аргументів, але git push може приймати необов\'язкові аргументи в форматі:',"","`git push <remote> <place>`","",""]}},{type:"ModalAlert",options:{markdowns:["Ви спитаєте, що таке аргумент `<place>`? Ми скоро вдамося в детальні пояснення, але спочатку -- приклад. Виконання команди:","","`git push origin master`","","буквально перекладається як:","",'*Піди в гілку, що називається "master" в моєму репозиторії, візьми всі коміти, піди у віддалений "master", що називається "origin". Додай ті коміти, яких немає в цій гілці і надрукуй, що саме ти зробив.*',"",'Вказуючи `master` в якості аргумента "place", ми сказали git-у, *звідки* взяти коміти і *куди* їх додати. ("Place") - фактично точка синхронізації двох репозиторіїв.',"","Пам'ятайте, що оскільки ми надали git-у всю необхідну інформацію (вказавши обидва аргументи), не має значення яка гілка є зараз поточною!"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Розгляньмо приклад використання аргументів. Зверніть увагу на поточну гілку в цьому прикладі."],afterMarkdowns:["Ось так! `master` у віддаленому репозиторії оновився, оскільки ми вказали його в аргументах."],command:"git checkout C0; git push origin master",beforeCommand:"git clone; git commit"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["А якщо не вказувати аргументів? Що станеться?"],afterMarkdowns:["Команда поверне помилку (як можна побачити), оскільки локальний `HEAD` не співпадає з відповідною віддаленою гілкою."],command:"git checkout C0; git push",beforeCommand:"git clone; git commit"}},{type:"ModalAlert",options:{markdowns:["Гаразд, на цьому рівні оновімо віддалені гілки `foo` і `master`. Для ускладнення ми заборонимо використовувати `git checkout`!","","*Пам'ятай, віддалені гілки позначені префіксом `o/`, оскільки повний префікс `origin/` не влазить в наш UI. Але не хвилюйся ","про це... ти можеш використовувати `origin` посилаючись на віддалений репозиторій.*"]}}]},vi:{childViews:[{type:"ModalAlert",options:{markdowns:["## Tham số đẩy","","Tuyệt! Bạn đã biết đến theo dõi từ xa, giờ thì ta có thể tìm hiểu sâu hơn về cách hoạt động của đẩy( `git push`), tìm nạp(`git fetch`) và kéo(`git pull`). Ta sẽ giải quyết từng câu lệnh một nhưng về căn bản chúng khá là giống nhau.","",'Trước hết hãy xem qua `git push`. Trong bài học về theo dõi từ xa bạn đã biết rằng git sử dụng thuộc tính(nhánh từ xa mà nó "theo dõi") của nhánh hiện tại để xác định kho và nhánh từ xa để đẩy. Git làm việc này mà không cần tham số chỉ định, nhưng lệnh git push có thể thêm tham số dưới dạng sau:',"","`git push <tên kho từ xa> <vị trí>`","",""]}},{type:"ModalAlert",options:{markdowns:["Tham số `<vị trí>` là gì vậy? Chúng ta sẽ đi sâu vào chi tiết sau sau, hãy xem ví dụ trước. Đưa ra câu lệnh:","","`git push origin master`","","được dịch lại là:","",'*Chuyển sang nhánh "master" trong kho lưu trữ cục bộ, nhận tất cả các commit và tìm nhánh "master" trong kho chứa từ xa tên là "origin". Thêm tất cả các commit không có trong nhánh đó và báo cho tôi biết khi nào hoàn tất.*',"",'Bằng cách chỉ định `master` trong tham số "vị trí",ta báo với git nơi mà commit *xuất phát* và nơi chúng *sẽ đến*. Về căn bản nó là "địa điểm" để đồng bộ hóa 2 kho chứa.',"","Lưu ý rằng ta ta đã thông báo cho gi tất cả thông tin cần thiết( thông qua chỉ định 2 tham số), nó sẽ không quan tâm nhánh mà ta đang đứng!"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Hãy xem xét một ví dụ về việc xác định tham số. Lưu ý vị trí nhánh mà ta đang đứng."],afterMarkdowns:["Được rồi! Bằng cách chỉ định các tham số, nhánh `master` trong kho lưu trữ từ xa đã được cập nhật."],command:"git checkout C0; git push origin master",beforeCommand:"git clone; git commit"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Giả sử ta không chỉ định các tham số thì sao? Điều gì sẽ xảy ra?"],afterMarkdowns:["Lệnh thất bại (như bạn có thể thấy, không có gì xảy ra)! Bởi vì `HEAD` không trỏ đến nhánh nào có theo dõi từ xa."],command:"git checkout C0; git push",beforeCommand:"git clone; git commit"}},{type:"ModalAlert",options:{markdowns:["Được rồi, trong cấp độ này hãy cập nhánh `foo` và `master` trên kho lưu trữ từ xa. Cái khó là ở cấp độ này lệnh `git checkout` đã bị vô hiệu hóa!","","*Chú ý: Các nhánh từ xa được đánh dấu bằng tiền tố `o/` bời vì UI của chúng tôi không chứa được hết `origin/`. Đừng lo ","về vấn đề này... đơn giản cứ dùng `origin` như bình thường thôi.*"]}}]}}}},{}],142:[function(e,t,o){o.level={goalTreeString:'{"branches":{"master":{"target":"C6","id":"master","remoteTrackingBranchID":"o/master"},"foo":{"target":"C4","id":"foo","remoteTrackingBranchID":"o/foo"},"o/master":{"target":"C4","id":"o/master","remoteTrackingBranchID":null},"o/foo":{"target":"C5","id":"o/foo","remoteTrackingBranchID":null}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"},"C2":{"parents":["C1"],"id":"C2"},"C3":{"parents":["C1"],"id":"C3"},"C4":{"parents":["C2","C3"],"id":"C4"},"C5":{"parents":["C2"],"id":"C5"},"C6":{"parents":["C5"],"id":"C6"}},"HEAD":{"target":"master","id":"HEAD"},"originTree":{"branches":{"master":{"target":"C4","id":"master","remoteTrackingBranchID":null},"foo":{"target":"C5","id":"foo","remoteTrackingBranchID":null}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"},"C2":{"parents":["C1"],"id":"C2"},"C5":{"parents":["C2"],"id":"C5"},"C3":{"parents":["C1"],"id":"C3"},"C4":{"parents":["C2","C3"],"id":"C4"}},"HEAD":{"target":"master","id":"HEAD"}}}',solutionCommand:"git push origin master^:foo;git push origin foo:master",startTree:'{"branches":{"master":{"target":"C6","id":"master","remoteTrackingBranchID":"o/master"},"foo":{"target":"C4","id":"foo","remoteTrackingBranchID":"o/foo"},"o/master":{"target":"C1","id":"o/master","remoteTrackingBranchID":null},"o/foo":{"target":"C1","id":"o/foo","remoteTrackingBranchID":null}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"},"C2":{"parents":["C1"],"id":"C2"},"C3":{"parents":["C1"],"id":"C3"},"C4":{"parents":["C2","C3"],"id":"C4"},"C5":{"parents":["C2"],"id":"C5"},"C6":{"parents":["C5"],"id":"C6"}},"HEAD":{"target":"master","id":"HEAD"},"originTree":{"branches":{"master":{"target":"C1","id":"master","remoteTrackingBranchID":null},"foo":{"target":"C1","id":"foo","remoteTrackingBranchID":null}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"}},"HEAD":{"target":"master","id":"HEAD"}}}',name:{en_US:"Git push arguments -- Expanded!",zh_CN:"Git push 参数 2",zh_TW:"git push 的參數，延伸討論！",es_AR:"¡Más! Parámetros de git push",es_ES:"¡Más! Parámetros de git push",pt_BR:"Parâmetros do git push -- expandido",gl:"Parámetros de git push -- ampliado",de_DE:"Optionen für Git Push -- noch mehr!",ja:"Git pushの引数 -- 拡張編!",fr_FR:"Arguments de git push -- toujours plus !",ru_RU:"Аргументы для push -- расширенная версия!",ko:"git push 인자 -- 확장판!",uk:"Розширені аргументи git push!",vi:"Tham số git push -- bản mở rộng!"},hint:{en_US:'Remember you can admit defeat and type in "show solution" :P',zh_CN:"如果你认输的话，可以通过“show solution”查看解决方案 :P",zh_TW:'如果你失敗了，可以利用 "show solution" 來找到解答:P',es_AR:'Recordá que podés admitir tu derrota y tipear "show solution" para ver la solución :P',es_ES:'Recuerda que puedes admitir tu derrota y escribir "show solution" para ver la solución :P',pt_BR:'Lembre-se que você pode admitir que foi derrotado e digitar "show solution" :P',gl:'Lembrate que podes admitir que fuches derrotado e escribir "show solution" para amosala solución :P',de_DE:'Vergiss nicht dass du aufgeben kannst, indem du "show solution" eingibst :P',ja:'降参して解説を見るには"show solution"を実行できるのをお忘れなく',fr_FR:'N\'oubliez pas que vous pouvez toujours déclarer forfait avec "show solution" :P',ru_RU:'Помните, Вы всегда можете признать своё поражение, набрав команду "show solution" (показать решение) :P',ko:'혹시 아세요? 패배를 인정하고 "show solution"을 입력할 수 있다는 걸요 :P',uk:'Пам\'ятай, ти завжди можеш визнати поразку і підглянути рішення командою "show solution" :P',vi:'Nhớ rằng, bạn có thể thừa nhận thất bại và gõ "show solution" :P'},startDialog:{en_US:{childViews:[{type:"ModalAlert",options:{markdowns:["## `<place>` argument details","","Remember from the previous lesson that when we specified `master` as the place argument for git push, we specified both the *source* of where the commits would come from and the *destination* of where the commits would go.","","You might then be wondering -- what if we wanted the source and destination to be different? What if you wanted to push commits from the `foo` branch locally onto the `bar` branch on remote?","","Well unfortunately that's impossible in git... just kidding! Of course it's possible :)... git has tons and tons of flexibility (almost too much).","","Let's see how in the next slide..."]}},{type:"ModalAlert",options:{markdowns:["In order to specify both the source and the destination of `<place>`, simply join the two together with a colon:","","`git push origin <source>:<destination>`","","This is commonly referred to as a colon refspec. Refspec is just a fancy name for a location that git can figure out (like the branch `foo` or even just `HEAD~1`).","","Once you are specifying both the source and destination independently, you can get quite fancy and precise with remote commands. Let's see a demo!"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Remember, `source` is any location that git will understand:"],afterMarkdowns:["Woah! That's a pretty trippy command but it makes sense -- git resolved `foo^` into a location, uploaded whatever commits that weren't present yet on the remote, and then updated destination."],command:"git push origin foo^:master",beforeCommand:"git clone; go -b foo; git commit; git commit"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["What if the destination you want to push doesn't exist? No problem! Just give a branch name and git will create the branch on the remote for you."],afterMarkdowns:["Sweet, that's pretty slick :D"],command:"git push origin master:newBranch",beforeCommand:"git clone; git commit"}},{type:"ModalAlert",options:{markdowns:["For this level, try to get to the end goal state shown in the visualization, and remember the format of:","","`<source>:<destination>`"]}}]},fr_FR:{childViews:[{type:"ModalAlert",options:{markdowns:["## L'argument `<place>` dans le détail","","Rappelez-vous de notre dernière leçon : quand vous passiez `master` comme argument `<place>` à git push, cela spécifiait à la fois la *source* de provenance des commits et leur *destination*.","","Vous vous demandez peut-être donc : et si nous voulions avoir une source et une destination différentes ? Et si vous voulez envoyez des commits de la branche locale `foo` dans la branche distante `bar` ?","","Malheureusement ce n'est pas possible avec git... Mais non, je plaisante ! Bien sûr que c'est possible :)... git a des tonnes de flexibilité (presque trop).","","Voyons cela au prochain slide..."]}},{type:"ModalAlert",options:{markdowns:["Pour spécifier la source et la destination dans `<place>`, on les joint simplement par deux points :","","`git push origin <source>:<destination>`","",'On en parle souvent comme d\'un "refspec". Refspec est juste un nom exotique pour un emplacement que git peut résoudre (comme la branche `foo` ou juste `HEAD~1`)',"","Lorsque vous utilisez cette notation permettant de préciser la source et la destination indépendamment, vous pouvez produire des commandes à la fois très sophistiquées et très précises pour travailler avec les dépôts distants. Faisons une démo !"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Rappelez-vous, `source` peut être n'importe quel emplacement que git peut résoudre :"],afterMarkdowns:["Woahou ! C'est une commande très alambiquée mais qui a du sens : git résoud `foo^` en un emplacement, envoie tous les commits qui n'étaient pas encore présents sur le dépôt distant, et met ensuite à jour la branche de destination."],command:"git push origin foo^:master",beforeCommand:"git clone; go -b foo; git commit; git commit"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Que se passe-t-il quand la destination du push n'existe pas encore ? Pas de problème ! Donnez simplement un nom de branche et git va créer la branche distante pour vous."],afterMarkdowns:["Cool, c'est habile :D"],command:"git push origin master:newBranch",beforeCommand:"git clone; git commit"}},{type:"ModalAlert",options:{markdowns:["Pour ce niveau, essayez d'atteindre l'état montré dans la fenêtre d'objectif, et souvenez-vous du format :","","`<source>:<destination>`"]}}]},es_AR:{childViews:[{type:"ModalAlert",options:{markdowns:["## Detalles sobre el parámetro `<lugar>`","","Acordate de la lección anterior que cuando especificamos `master` como el parámetro lugar de git push, especificamos tanto el *origen* del que sacar los commits como el *destino* al que enviarlos.","","Podrías estar preguntándote ¿Y si quisiéramos que el origen y el destino sean distintos? ¿Si quisieras pushear los commits de la rama local `foo` a la rama `bar` del remote?","","Bueno, lamentablemente eso no se puede hacer en git... ¡Bazinga! Claro que se puede :)... git es extremadísimamente flexible (casi casi que demasiado).","","Veamos cómo hacerlo a continuación..."]}},{type:"ModalAlert",options:{markdowns:["Para especificar tanto el origen como el destino de `<lugar>`, simplemente unilos usando un dos puntos:","","`git push origin <origen>:<destino>`","","Esto se lo suele llamar refspec con dos puntos. Refspec es simplemente un nombre cool para una ubicación que git puede entender (como la rama `foo`, o incluso `HEAD~1`)","","Una vez que especificás tanto el origen como el destino independientemente, podés ponerte bastante cómodo y preciso con los comandos remotos. ¡Veamos una demo!"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Recordá: `origen` es cualquier ubicación que git pueda entender:"],afterMarkdowns:["¡Woow! Ese commando es bastante loco, pero tiene sentido: git resolvió `foo^` a una ubicación, subió cualquier commit de ahí que aún no estuviera en el remoto, y luego actualizó el destino."],command:"git push origin foo^:master",beforeCommand:"git clone; go -b foo; git commit; git commit"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["¿Y qué hay si el destino al que querés pushear no existe? ¡No hay drama! Simplemente dale un nombre al branch y git se va a encargar de creártelo en el remoto."],afterMarkdowns:["Genial, simplemente fluye :D"],command:"git push origin master:newBranch",beforeCommand:"git clone; git commit"}},{type:"ModalAlert",options:{markdowns:["Para este nivel, tratá de llegar al objetivo final, y acordate del formato:","","`<origen>:<destino>`"]}}]},es_ES:{childViews:[{type:"ModalAlert",options:{markdowns:["## Detalles sobre el parámetro `<lugar>`","","Recuerda de la lección anterior que cuando especificamos `master` como el parámetro lugar de git push, especificamos tanto el *origen* del que sacar los commits como el *destino* al que enviarlos.","","Podrías estar preguntándote ¿Y si quisiéramos que el origen y el destino fuesen distintos? ¿Si quisieras hacer push de los commits de la rama local `foo` a la rama `bar` del remote?","","Bueno, lamentablemente eso no se puede hacer en git... ¡zasca! Claro que se puede :)... git es extremadamente flexible (casi casi que demasiado).","","Veamos cómo hacerlo a continuación..."]}},{type:"ModalAlert",options:{markdowns:["Para especificar tanto el origen como el destino de `<lugar>`, simplemente únelos usando el signo `dos puntos`:","","`git push origin <origen>:<destino>`","","A esto se le suele llamar refspec con dos puntos. Refspec es simplemente un nombre genial para una ubicación que git puede entender (como la rama `foo`, o incluso `HEAD~1`)","","Una vez que especificas tanto el origen como el destino independientemente, puedes ponerte bastante cómodo y preciso con los comandos remotos. ¡Veamos una demo!"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Recuerda: `origen` es cualquier ubicación que git pueda entender:"],afterMarkdowns:["¡Vaya! Ese commando es bastante rompedor, pero tiene sentido: git resolvió `foo^` a una ubicación, subió cualquier commit de ahí que aún no estuviera en el remoto, y luego actualizó el destino."],command:"git push origin foo^:master",beforeCommand:"git clone; go -b foo; git commit; git commit"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["¿Y qué ocurre si el destino al que quieres hacer push no existe? ¡Sin problema! Simplemente dale un nombre a la rama y git se va a encargar de creártelo en el remoto."],afterMarkdowns:["Genial, simplemente fluye :D"],command:"git push origin master:newBranch",beforeCommand:"git clone; git commit"}},{type:"ModalAlert",options:{markdowns:["Para este nivel, trata de llegar al objetivo final, y recuerda el formato:","","`<origen>:<destino>`"]}}]},pt_BR:{childViews:[{type:"ModalAlert",options:{markdowns:["## Detalhes sobre `<lugar>`","","Lembra que na lição anterior especificamos `master` como o parâmetro lugar para o git push? Lá definimos tanto a *origem* de onde os commits viriam quanto o *destino* para onde os commits foram.","","Você pode estar se perguntando -- e se eu quisesse que a origem e o destino fossem diferentes? E se eu quisesse enviar commits do ramo local `foo` para o ramo remoto `bar`?","","Bem, infelizmente isso é impossível no Git... só brincando! Claro que é possível :)... o Git tem muita flexibilidade (até mais do que deveria).","","Veremos como fazê-lo no próximo slide..."]}},{type:"ModalAlert",options:{markdowns:["Para especificar tanto a origem como o destino do `<lugar>`, simplesmente juntamos os dois usando dois-pontos:","","`git push origin <origem>:<destino>`","",'Isso é geralmente chamado de "colon refspec" (especificação de referência com dois-pontos). Refspec é só um nome extravagante para um local que o Git consiga entender (como o ramo `foo` ou mesmo `HEAD~1`)',"","Uma vez que você está especificando tanto a origem como o destino independentemente, você pode ser bastante preciso nos comandos relacionados a repositórios remotos. Vejamos uma demonstração!"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Lembre-se, `origem` é qualquer lugar que o Git possa entender:"],afterMarkdowns:["Uau! Esse comando é bastante viajado, mas ele faz sentido -- o Git entendeu a referência `foo^`, enviou quaisquer commits que não estavam presentes no repositório remoto, e então atualizou o destino."],command:"git push origin foo^:master",beforeCommand:"git clone; go -b foo; git commit; git commit"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["E se o destino para o qual você quiser fazer push não existir? Sem problemas! Dê um nome de ramo e o Git criará o ramo no repositório remoto para você."],afterMarkdowns:["Doce, isso é muito bom :D"],command:"git push origin master:newBranch",beforeCommand:"git clone; git commit"}},{type:"ModalAlert",options:{markdowns:["Para este nível, tente chegar ao estado do objetivo mostrado na visualização, e lembre-se do formato:","","`<origem>:<destino>`"]}}]},gl:{childViews:[{type:"ModalAlert",options:{markdowns:["## Detalles sobre o parámetro `<lugar>`","","Lémbrate da lección anterior cando especificamos `master` como o parámetro lugar de git push, especificamos tanto a *orixe* do que sacar os commits como o *destino* ó que envialos.","","Poderías estar a preguntarte ¿E se quixéramos que a orixe  e o destino sexan distintos? ¿Se quixéramos empurrar os commits da  rama local `foo` á rama `bar` do remoto?","","Bueno, esto non se pode facer en git... ¡Caramboliñas! Claro que se pode :D. git é extremadísimamente flexibe (case case que de máis).","","Vexamos cómo facelo a continuación..."]}},{type:"ModalAlert",options:{markdowns:["Para especificar tanto a orixe como o destino de `<lugar>`, sinxelamente úneos empregando dous puntos:","","`git push origin <orixe>:<destino>`","","Esto pódeselle chamar refspec con dous puntos. Refspec é sinxelamente un nome cool para unha ubicación que git pode entender (como a rama `foo`, ou incluso `HEAD~1`)","","Unha vez que especificas a orixe e o destino independientemente, podes poñerte cómodo e preciso cos  comandos remotos. ¡Vexamos a demo!"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Lembra: `orixe` é calquera ubicación que git poida entender:"],afterMarkdowns:["¡Woow! Ese commando é unha tolemia, pero ten sentido: git resolveu `foo^` a unha ubicación, subiu calquera commit de ahí que aún non estivera no remoto, e logo actualizou o destino."],command:"git push origin foo^:master",beforeCommand:"git clone; go -b foo; git commit; git commit"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["¿E qué hai se o destino ó que queres empurrar non existise? ¡Non pasa nada! Sinxelamente dalle un nome á rama e git vaise encargar de crealo no remoto."],afterMarkdowns:["Xenial, sinxelamente tira para adiante"],command:"git push origin master:newBranch",beforeCommand:"git clone; git commit"}},{type:"ModalAlert",options:{markdowns:["Para este nivel, intenta chegar o obxectivo final, e lembrate do formato:","","`<orixe>:<destino>`"]}}]},zh_TW:{childViews:[{type:"ModalAlert",options:{markdowns:["## `<place>` 這個參數的細節","","回想一下，我們在之前的課程中提到，當我們用 `git push` 並且把 `master`  當作 `<place>` 這個參數的時候，我們就相當於告訴 git 我們的所要更新的 commit 要*從哪裡來*（source） 並且要 *往哪裡去*（destination）。","","你可能會很好奇，當我們的 source 以及 destination 是不同的時候，應該怎麼做？當你想要 push `foo` branch 上面的 commit 到 remote 的 `bar` branch 的時候，應該怎麼做？","","很遺憾地，對於 git 來說這是不可能的...開玩笑的啦！當然是有可能的:)... git 有非常非常大的彈性（太超過了啦）。","","讓我們來看看下一頁..."]}},{type:"ModalAlert",options:{markdowns:["為了要指定 `<place>` 的 source 以及 destination，只要利用一個冒號將這兩個連在一起：","","`git push origin <source>:<destination>`","","這通常被稱為一個 colon （冒號） refspec，refspec 只是一個表示 location （位置） 的花俏的名稱，這個位置可以被 git 辨別（例如 `foo` branch 或是 `HEAD~1`）。","","一旦你單獨指定了 source 以及 destination，你可以看到花俏且準確的指令。讓我來來看一個例子！"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["記住， `source` 表示任意可以被 git 辨識的位置："],afterMarkdowns:["哇!這實在是一個很花俏的指令但是確很合理，git 把 `foo^` 解讀成一個位置，並且 push 該位置的 commit 到目前 remote 的 master branch。"],command:"git push origin foo^:master",beforeCommand:"git clone; go -b foo; git commit; git commit"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["如果你想要 push 的 destination 不存在怎麼辦？沒有問題！只要給一個 branch 的名稱，git 就會在 remote 幫你建立。"],afterMarkdowns:["太讚了，實在非常地簡單:D"],command:"git push origin master:newBranch",beforeCommand:"git clone; git commit"}},{type:"ModalAlert",options:{markdowns:["對於這個關卡，想辦法達到這個視覺化的目標，而且要記得格式：","","`<source>:<destination>`"]}}]},zh_CN:{childViews:[{type:"ModalAlert",options:{markdowns:["## `<place>`参数详解","","还记得之前课程说的吧，当为 git push 指定 place 参数为 `master` 时，我们同时指定了提交记录的来源和去向。","","你可能想问 —— 如果来源和去向分支的名称不同呢？比如你想把本地的 `foo` 分支推送到远程仓库中的 `bar` 分支。","","哎，很遗憾 Git 做不到…… 开个玩笑，别当真！当然是可以的啦 :) Git 拥有超强的灵活性（有点过于灵活了）","","接下来咱们看看是怎么做的……"]}},{type:"ModalAlert",options:{markdowns:["要同时为源和目的地指定 `<place>` 的话，只需要用冒号 `:` 将二者连起来就可以了：","","`git push origin <source>:<destination>`","","这个参数实际的值是个 refspec，“refspec” 是一个自造的词，意思是 Git 能识别的位置（比如分支 `foo` 或者 `HEAD~1`）","","一旦你指定了独立的来源和目的地，就可以组织出言简意赅的远程操作命令了，让我们看看演示！"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["记住，`source` 可以是任何 Git 能识别的位置："],afterMarkdowns:["这是个另人困惑的命令，但是它确实是可以运行的 —— Git 将 `foo^` 解析为一个位置，上传所有未被包含到远程仓库里 `master` 分支中的提交记录。"],command:"git push origin foo^:master",beforeCommand:"git clone; go -b foo; git commit; git commit"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["如果你要推送到的目的分支不存在会怎么样呢？没问题！Git 会在远程仓库中根据你提供的名称帮你创建这个分支！"],afterMarkdowns:["很赞吧！它是不是很聪明？！ :D"],command:"git push origin master:newBranch",beforeCommand:"git clone; git commit"}},{type:"ModalAlert",options:{markdowns:["在这个关卡中，试着完成目标窗口展示的提交树，记住参数格式哟：","","`<source>:<destination>`"]}}]},de_DE:{childViews:[{type:"ModalAlert",options:{markdowns:["## Details zum `<Ort>`-Parameter","",'Du erinnerst dich von dem vorherigen Level, dass, als wir `master` als "Ort" beim `git push` angegeben haben, daraus sowohl die *Quelle* als auch das *Ziel* für die Operation abgeleitet wurden.',"","Daher fragst du dich vielleicht -- was wenn wir möchten, dass Quelle und Ziel anders sind? Was wenn du Commits von einem lokalen Branch `foo` in den Branch `bar` auf einem Server schieben möchtest?","","Tja, leider ist das in Git unmöglich .... ein Scherz! Natürlich ist das möglich. Git besitzt tonnenweise Flexibilität (eher zuviel, als zuwenig).","","Und gleich sehen wir, wie das geht ..."]}},{type:"ModalAlert",options:{markdowns:["Um sowohl Quelle als auch Ziel im `<Ort>`-Parameter anzugeben, gib sie einfach verbunden mit einem Doppelpunkt ein:","","`git push origin <Quelle>:<Ziel>`","","Das wird üblicherweise Refspec (Referenz-Spezifikation) genannt. Refspec ist nur ein anderer Name für einen Ort, mit dem Git etwas anfangen kann (wie mit Branch `foo` oder mit `HEAD~2`)","","Sobald du Quelle und Ziel separat angibt, kannst du flexibel und präzise entfernte Branches ansteuern. Hier eine Demo:"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Vergiss nicht, `Quelle` ist jeder mögliche Ort, mit dem Git etwas anfangen kann:"],afterMarkdowns:["Boah! Das ist ein ziemlich abgefahrener Befehl gewesen, aber er ist sinnvoll -- Git hat `foo^` zu einem Commit aufgelöst, alle Commits die bis zu diesem einschließich noch nicht auf dem Server waren hochgeladen und dann dort das Ziel aktualisiert."],command:"git push origin foo^:master",beforeCommand:"git clone; go -b foo; git commit; git commit"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Was wäre wenn das Ziel des `push` gar nicht existiert? Kein Problem! Wenn das Ziel ein Branch-Name ist, wird Git den Branch auf dem Server einfach anlegen."],afterMarkdowns:["Schick, das ist ziemlich praktisch. :D"],command:"git push origin master:newBranch",beforeCommand:"git clone; git commit"}},{type:"ModalAlert",options:{markdowns:["Um dieses Level zu schaffen versuch den dargestellten Zielzustand zu erreichen und vergiss nicht das Format:","","`<Quelle>:<Ziel>`"]}}]},ru_RU:{childViews:[{type:"ModalAlert",options:{markdowns:["## Подробности аргумента `<пункт назначения>`","","Помните, когда в прошлом занятии мы указали в качестве аргумента ветку `master` для команды git push, мы указали совместно *источник*, откуда будут приходить коммиты, и *пункт назначения (получатель)*, куда коммиты будут уходить.","","Однако, вы, наверное, задаётесь вопросом - а что, если я хочу, чтобы мои источник и получатель коммитов были различными? Что, если мы хотим запушить коммиты из локальной ветки `foo` в ветку `bar` на удалённом репозитории?","","К огромному сожалению, это невозможно сделать средствами git... Да ладно! Я пошутил! Конечно, это возможно :)... git сам по себе достаточно гибок (даже слишком).","","Мы увидим, как именно, на следующем слайде..."]}},{type:"ModalAlert",options:{markdowns:["В том случае, когда вам необходимо разделить источник и получатель аргумента `<пункт назначения>`, соедините их вместе, используя двоеточие:","","`git push origin <источник>:<получатель>`","","Обычно это называется `refspec`. Refspec — это всего лишь модное имя для определения местоположения, которое git может распознать (например, ветка `foo` или просто `HEAD~1`)","","Как только вы указали источник и получатель независимо друг от друга, вы можете довольно причудливо и точно использовать команды для работы с удалёнными ветками и репозиториями. Давайте взглянем на демонстрацию!"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Помните, `источник` - всего лишь местоположение, которое git должен понять:"],afterMarkdowns:["Вау! Это довольно нетривиальная команда, однако она имеет смысл - git видит в `foo^` не что иное, как местоположение, закачивает все коммиты, которые не присутствуют на удалённом репозитории, и затем обновляет получателя."],command:"git push origin foo^:master",beforeCommand:"git clone; go -b foo; git commit; git commit"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["А что если пункт назначения, в который вы хотите запушить, не существует? Без проблем! Укажите имя ветки, и git сам создаст ветку на удалённом репозитории для вас."],afterMarkdowns:["Класс! Довольно легко! :D"],command:"git push origin master:newBranch",beforeCommand:"git clone; git commit"}},{type:"ModalAlert",options:{markdowns:["Для выполнения данного уровня попытайтесь привести своё дерево к такому же виду, как на визуализации. И не забудьте о формате:","","`<источник>:<получатель>`"]}}]},ko:{childViews:[{type:"ModalAlert",options:{markdowns:["## `<place>` 인자에 대한 세부사항들","","","기억하세요? 이전 강의에서 우리는 `master`를 커밋의 근원이되는 *source*와 목적지가 되는 *destination*으로 명령어의 인자로 넣어줌으로써 지정해줬습니다.","여러분은 이런 생각이 들 수 있어요 -- 내가 source와 destination이 다르길 원하면 어떻게 해야되지? 로컬의 `foo` 브랜치에서 원격의 `bar` 브랜치로 커밋을 push하고 싶으면 어떻게 해야 되지?","","사실 git에서는 그게 불가능합니다... 네 농담이고! 당연 가능합니다 :)... git의 어마무시하게 유연합니다(지나칠정도로요).","","어떻게 하는지는 다음 슬라이드에서 확인해봅시다..."]}},{type:"ModalAlert",options:{markdowns:["source와 destination을 모두 지정하기 위해서는, 이렇게 간단히 두개를 콜론을 사이에 두고 표현하면 됩니다.","","`git push origin <source>:<destination>`","","이것을 일반적으로 colon refspec(콜론 참조스펙)이라고 부릅니다. 참조스펙은 그냥 \"git이 알아낼 수 있는 위치\"를 이름 붙여서 말하는거에요 (브랜치 'foo'라던가 HEAD~1 라던가)","","source와 destination을 따로 지정할 수 있게 되면서, 이제 원격관련 명령어를 좀 멋지고 정확히 사용할수 있게 되었어요. 데모를 봅시다!"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["기억하세요, `source`는 git이 이해하는 아무 위치를 말합니다.:"],afterMarkdowns:["워 뭔가 잘 안쓸것 같은 명령이지만 잘 됩니다 -- git은 `foo^`의 위치를 알아내서 원격 저장소에 아직 반영되지 않은 커밋들을 업로드하고 destination 브랜치를 갱신했습니다."],command:"git push origin foo^:master",beforeCommand:"git clone; go -b foo; git commit; git commit"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["만약 여러분이 push하고 싶은 destination(목적지)가 없으면 어떻게하죠? 아무 문제 없어요! git이 만들 새 브랜치 이름을 지어주면 git이 원격 저장소에 새 브랜치를 만들어 줄거에요."],afterMarkdowns:["좋네요, 번지르르 삐까뻔쩍 :D"],command:"git push origin master:newBranch",beforeCommand:"git clone; git commit"}},{type:"ModalAlert",options:{markdowns:["이번 레벨에서는, goal 시각화에 나오는 것처럼 만들어 주세요 인자의 형식은 다음과 같다는걸 기억하세요:","","`<source>:<destination>`"]}}]},uk:{childViews:[{type:"ModalAlert",options:{markdowns:["## Детальніше про аргумент `<place>`","","З попереднього уроку нам відомо, що коли ми вказуємо `master` в якості аргумента place для git push, ми задаємо і гілку, *з якої* брати нові коміти, і гілку *до якої* їх буде перенесено.","","Тут ти можеш задуматись, а чи можуть гілки, звідки беремо, і куди переносимо, бути різними? Що, коли потрібно коміти з локальної гілки `foo` перенести у віддалену гілку `bar`?","","Нажаль в git це неможливо... жартую! Звісно, що можливо :)... git просто неймовірно гнучкий (іноді аж занадто).","","Подивімося як це робиться..."]}},{type:"ModalAlert",options:{markdowns:["Для того, щоб в одному аргументі `<place>` вказати і місце звідки і куди, треба їх просто розділити двокрапкою:","","`git push origin <source>:<destination>`","",'Такий запис називають "colon refspec". Тут refspec - це просто зручна назва місця, яке git може ідентифікувати (наприклад, гілка `foo` чи просто `HEAD~1`)',"","Можливість вказати два різних місця дає велику свободу і гнучкість в роботі з віддаленим репозиторієм. Подивімось демонстрацію!"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Пам'ятай, `source` -- це будь-яка назва місця, зрозуміла гіту:"],afterMarkdowns:["Овва! Це доволі незвична команда, але тут все має сенс -- git, знаючи куди вказує `foo^`, завантажив на віддалену сторону ще відсутні там коміти і оновив місце призначення."],command:"git push origin foo^:master",beforeCommand:"git clone; go -b foo; git commit; git commit"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["А що, коли вказаного місця призначення не існує? Нема проблем! Просто вкажи назву гілки і гіт створить її на віддаленому сервері."],afterMarkdowns:["Спритно, еге-ж? :D"],command:"git push origin master:newBranch",beforeCommand:"git clone; git commit"}},{type:"ModalAlert",options:{markdowns:["На цьому рівні спробуй досягти стану ропозиторію, показаного у візуалізації і пам'ятай про формат запису з двокрапкою:","","`<source>:<destination>`"]}}]},vi:{childViews:[{type:"ModalAlert",options:{markdowns:["## Chi tiết về tham số `<vị trí>`","","Nhớ lại học trước, khi chỉ định tham số `<vị trí>` là `master` cho lệnh `git push`, ta cũng đã chỉ định nguồn và đích cho các commit.","","Có thể bạn sẽ thắng mắc -- Nếu như ta muốn nguồn và đích khác đi thì sao? Nếu như ta muốn đẩy commit từ nhánh cục bộ `foo` lên nhánh từ xa `bar` thì sao?","","Chà đáng tiếc là điều này là bất khả thi tron git... đùa thôi! Tất nhiên là làm được chứ :)... git có nhiều và rất nhiều lựa chọn linh động(có lẽ là quá nhiều)","","Hãy xem cách nó hoạt động ..."]}},{type:"ModalAlert",options:{markdowns:["Để chỉ định `<vị trí>` cho cả nguồn và đích, chỉ cần sử dụng dấu hai chấm `:` để kết nối cả hai:","","`git push origin <nguồn>:<đích>`","",'Giá trị thực của tham số này là một refspec, "refspec" là một từ tự tạo, nghĩa là một vị trí được Git nhận ra (chẳng hạn như nhánh `foo` hoặc` HEAD ~ 1`).',"","Một khi bạn đã chỉ định các nguồn và đích độc lập, bạn có thể thao tác với kho chứa từ xa một cách khá thú vị và chính xác, hãy xem bản demo!"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Nhớ rằng, `nguồn` là bất kỳ vị trí nào mà git hiểu:"],afterMarkdowns:["Wao! Lệnh này khá phức tạp, nhưng mà hợp lý -- git diễn giải `foo^` thành một vị trí, tải lên tất cả các commit từ đó trở về trước mà chưa có trên nhánh đích rồi cập nhật nó."],command:"git push origin foo^:master",beforeCommand:"git clone; go -b foo; git commit; git commit"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Nếu như đích đến mà bạn muốn không tồn tại thì sao? Chẳng sao cả! Đơn giản hãy gõ tên nhánh và git sẽ tạo nhánh đó trên kho chứa từ xa cho bạn."],afterMarkdowns:["Tuyệt vời, thấy git thú vị không :D"],command:"git push origin master:newBranch",beforeCommand:"git clone; git commit"}},{type:"ModalAlert",options:{markdowns:["Ở cấp độ này, hãy hoàn thành mục tiêu được mô tả, và hãy nhớ cấu trúc:","","`<nguồn>:<đích>`"]}}]}}}},{}],143:[function(e,t,o){o.level={goalTreeString:"%7B%22branches%22%3A%7B%22master%22%3A%7B%22target%22%3A%22C7%27%22%2C%22id%22%3A%22master%22%2C%22remoteTrackingBranchID%22%3A%22o/master%22%2C%22localBranchesThatTrackThis%22%3Anull%7D%2C%22o/master%22%3A%7B%22target%22%3A%22C7%27%22%2C%22id%22%3A%22o/master%22%2C%22remoteTrackingBranchID%22%3Anull%2C%22localBranchesThatTrackThis%22%3A%5B%22master%22%5D%7D%2C%22side1%22%3A%7B%22target%22%3A%22C2%27%22%2C%22id%22%3A%22side1%22%2C%22remoteTrackingBranchID%22%3Anull%2C%22localBranchesThatTrackThis%22%3Anull%7D%2C%22side2%22%3A%7B%22target%22%3A%22C4%27%22%2C%22id%22%3A%22side2%22%2C%22remoteTrackingBranchID%22%3Anull%2C%22localBranchesThatTrackThis%22%3Anull%7D%2C%22side3%22%3A%7B%22target%22%3A%22C7%27%22%2C%22id%22%3A%22side3%22%2C%22remoteTrackingBranchID%22%3Anull%2C%22localBranchesThatTrackThis%22%3Anull%7D%7D%2C%22commits%22%3A%7B%22C0%22%3A%7B%22parents%22%3A%5B%5D%2C%22id%22%3A%22C0%22%2C%22rootCommit%22%3Atrue%7D%2C%22C1%22%3A%7B%22parents%22%3A%5B%22C0%22%5D%2C%22id%22%3A%22C1%22%7D%2C%22C2%22%3A%7B%22parents%22%3A%5B%22C1%22%5D%2C%22id%22%3A%22C2%22%7D%2C%22C3%22%3A%7B%22parents%22%3A%5B%22C1%22%5D%2C%22id%22%3A%22C3%22%7D%2C%22C4%22%3A%7B%22parents%22%3A%5B%22C3%22%5D%2C%22id%22%3A%22C4%22%7D%2C%22C5%22%3A%7B%22parents%22%3A%5B%22C1%22%5D%2C%22id%22%3A%22C5%22%7D%2C%22C6%22%3A%7B%22parents%22%3A%5B%22C5%22%5D%2C%22id%22%3A%22C6%22%7D%2C%22C7%22%3A%7B%22parents%22%3A%5B%22C6%22%5D%2C%22id%22%3A%22C7%22%7D%2C%22C8%22%3A%7B%22parents%22%3A%5B%22C1%22%5D%2C%22id%22%3A%22C8%22%7D%2C%22C2%27%22%3A%7B%22parents%22%3A%5B%22C8%22%5D%2C%22id%22%3A%22C2%27%22%7D%2C%22C3%27%22%3A%7B%22parents%22%3A%5B%22C2%27%22%5D%2C%22id%22%3A%22C3%27%22%7D%2C%22C4%27%22%3A%7B%22parents%22%3A%5B%22C3%27%22%5D%2C%22id%22%3A%22C4%27%22%7D%2C%22C5%27%22%3A%7B%22parents%22%3A%5B%22C4%27%22%5D%2C%22id%22%3A%22C5%27%22%7D%2C%22C6%27%22%3A%7B%22parents%22%3A%5B%22C5%27%22%5D%2C%22id%22%3A%22C6%27%22%7D%2C%22C7%27%22%3A%7B%22parents%22%3A%5B%22C6%27%22%5D%2C%22id%22%3A%22C7%27%22%7D%7D%2C%22HEAD%22%3A%7B%22target%22%3A%22master%22%2C%22id%22%3A%22HEAD%22%7D%2C%22originTree%22%3A%7B%22branches%22%3A%7B%22master%22%3A%7B%22target%22%3A%22C7%27%22%2C%22id%22%3A%22master%22%2C%22remoteTrackingBranchID%22%3Anull%2C%22localBranchesThatTrackThis%22%3Anull%7D%7D%2C%22commits%22%3A%7B%22C0%22%3A%7B%22parents%22%3A%5B%5D%2C%22id%22%3A%22C0%22%2C%22rootCommit%22%3Atrue%7D%2C%22C1%22%3A%7B%22parents%22%3A%5B%22C0%22%5D%2C%22id%22%3A%22C1%22%7D%2C%22C8%22%3A%7B%22parents%22%3A%5B%22C1%22%5D%2C%22id%22%3A%22C8%22%7D%2C%22C2%27%22%3A%7B%22parents%22%3A%5B%22C8%22%5D%2C%22id%22%3A%22C2%27%22%7D%2C%22C3%27%22%3A%7B%22parents%22%3A%5B%22C2%27%22%5D%2C%22id%22%3A%22C3%27%22%7D%2C%22C4%27%22%3A%7B%22parents%22%3A%5B%22C3%27%22%5D%2C%22id%22%3A%22C4%27%22%7D%2C%22C5%27%22%3A%7B%22parents%22%3A%5B%22C4%27%22%5D%2C%22id%22%3A%22C5%27%22%7D%2C%22C6%27%22%3A%7B%22parents%22%3A%5B%22C5%27%22%5D%2C%22id%22%3A%22C6%27%22%7D%2C%22C7%27%22%3A%7B%22parents%22%3A%5B%22C6%27%22%5D%2C%22id%22%3A%22C7%27%22%7D%7D%2C%22HEAD%22%3A%7B%22target%22%3A%22master%22%2C%22id%22%3A%22HEAD%22%7D%7D%7D",solutionCommand:"git fetch;git rebase o/master side1;git rebase side1 side2;git rebase side2 side3;git rebase side3 master;git push",startTree:'{"branches":{"master":{"target":"C1","id":"master","remoteTrackingBranchID":"o/master","localBranchesThatTrackThis":null},"o/master":{"target":"C1","id":"o/master","remoteTrackingBranchID":null,"localBranchesThatTrackThis":["master"]},"side1":{"target":"C2","id":"side1","remoteTrackingBranchID":null,"localBranchesThatTrackThis":null},"side2":{"target":"C4","id":"side2","remoteTrackingBranchID":null,"localBranchesThatTrackThis":null},"side3":{"target":"C7","id":"side3","remoteTrackingBranchID":null,"localBranchesThatTrackThis":null}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"},"C2":{"parents":["C1"],"id":"C2"},"C3":{"parents":["C1"],"id":"C3"},"C4":{"parents":["C3"],"id":"C4"},"C5":{"parents":["C1"],"id":"C5"},"C6":{"parents":["C5"],"id":"C6"},"C7":{"parents":["C6"],"id":"C7"}},"HEAD":{"target":"side3","id":"HEAD"},"originTree":{"branches":{"master":{"target":"C8","id":"master","remoteTrackingBranchID":null,"localBranchesThatTrackThis":null}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"},"C8":{"parents":["C1"],"id":"C8"}},"HEAD":{"target":"master","id":"HEAD"}}}',hint:{en_US:"Remember you can always use the undo or reset commands",zh_CN:"你随时都可以使用 undo 或 reset 命令。",zh_TW:"你隨時都可以使用 undo 或 reset 指令。",es_AR:"Acordate que siempre podés usar los comandos reset y undo",es_ES:"Recuerda que siempre puedes usar los comandos reset y undo",pt_BR:"Lembre-se que você sempre pode usar undo ou reset",gl:"Lembra que sempre podes usar undo ou reset",de_DE:"Denk dran, du kannst immer undo oder reset benutzen, um deine Befehle zurück zu nehmen.",ja:"undoやresetコマンドをいつでも使用することができるのをお忘れなく",fr_FR:"Rappelez-vous que vous pouvez toujours utiliser les commandes undo et reset.",ru_RU:"Помни - ты всегда можешь отменить команды с помощью undo или reset",ko:"명령어를 undo와 reset으로 되돌릴 수 있다는 것을 잊지마세요",uk:"Пам'ятай, ти в будь-який момент можеш використовувати команди undo або reset",vi:"Nhớ rằng bạn luôn luôn có thể hoàn tác hoặc soạn lại câu lệnh "},name:{en_US:"Push Master!",zh_CN:"推送主分支",zh_TW:"push master！",es_AR:"¡Push Master!",es_ES:"¡Push Master!",pt_BR:"Push Master!",gl:"Empurra ó Master!",de_DE:"Push Master!",ja:"Push Master!",fr_FR:"Maître du push !",ru_RU:"Push Мастер!",ko:"Push Master!",uk:"Push Maйстер!",vi:"Push Master!"},compareOnlyMasterHashAgnostic:!0,startDialog:{en_US:{childViews:[{type:"ModalAlert",options:{markdowns:["## Merging feature branches","","Now that you're comfortable with fetching, pulling, and pushing, lets put these skills to the test with a new workflow.","","It's common for developers on big projects to do all their work on feature branches (off of `master`) and then integrate that work only once it's ready. This is similar to the previous lesson (where side branches get pushed to the remote), but here we introduce one more step.","","Some developers only push and pull when on the `master` branch -- that way `master` always stays updated to what is on the remote (`o/master`).","","So for this workflow we combine two things:","","* integrating feature branch work onto `master`, and","* pushing and pulling from the remote"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Let's see a refresher real quick of how to update `master` and push work."],afterMarkdowns:["We executed two commands here that:","","* rebased our work onto new commits from remote, and","* published our work to the remote"],command:"git pull --rebase; git push",beforeCommand:"git clone; git commit; git fakeTeamwork"}},{type:"ModalAlert",options:{markdowns:["This level is pretty hefty -- here is the general outline to solve:","","* There are three feature branches -- `side1` `side2` and `side3`","* We want to push each one of these features, in order, to the remote","* The remote has since been updated, so we will need to incorporate that work as well","",":O intense! good luck, completing this level is a big step."]}}]},fr_FR:{childViews:[{type:"ModalAlert",options:{markdowns:["## Fusionner les feature branches","","Maintenant que vous êtes habitué à fetch, pull et push, mettons ces compétences à profit avec une autre approche de travail.","","Il est commun pour les développeurs de gros projets de faire tout leur travail dans des \"feature branches\" dédiées à une fonctionnalité (en dehors de `master`) et d'intégrer ce travail au reste seulement une fois qu'il est prêt. C'est similaire à la leçon précédente (où les branches secondaires étaient pushées sur le dépôt distant), mais ici nous introduisons une étape supplémentaire.","",'Certains développeurs utilisent la méthode "push puis pull" uniquement sur la branche `master` : de cette manière `master` reste toujours à jour avec ce qu\'il y a sur le dépôt distant (`o/master`).',"","Cette approche combine donc deux choses :","","* intégrer le travail présent depuis la feature branch (la fonctionnalité développée) vers `master`, puis","* pusher et puller sur le dépôt distant."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Rappelons-nous rapidement comment mettre à jour `master` et envoyer (push) le travail."],afterMarkdowns:["Nous exécutons ici deux commandes :","","* on rebase notre travail sur de nouveaux commits, puis","* on publie notre travail sur le dépôt distant"],command:"git pull --rebase; git push",beforeCommand:"git clone; git commit; git fakeTeamwork"}},{type:"ModalAlert",options:{markdowns:["Ce niveau est assez conséquent; voici l'idée générale de la solution :","","* Il y a trois feature branches : `side1` `side2` et `side3`","* Nous voulons envoyer chacune de ces modifications, dans l'ordre, sur le dépôt distant","* Le dépôt distant a été mis à jour entre-temps, donc nous avons aussi besoin d'intégrer ce travail","",":O difficile ! bonne chance, finir ce niveau est une grande étape."]}}]},es_AR:{childViews:[{type:"ModalAlert",options:{markdowns:["## Mergeando feature branches","","Ahora que estás cómodo fetcheando, pulleando y pusheando, pongamos a prueba estas habilidades con un nuevo flujo de trabajo.","","Es bastante común que los desarrolladores en los grandes proyectos trabajen sobre ramas específicas para cada tarea (feature branches) basadas en `master`, y que las integren sólo cuando están listas. Esto es similar a la lección anterior, en que pusheabamos las ramas periféricas al remoto, pero acá tenemos un paso más.","","Algunos desarrolladores sólo pushean y pullean cuando están en `master`: de ese modo, `master` siempre se mantiene actualizado con el remoto (`o/master`).","","Entonces, en este flujo de trabajo combinamos dos cosas:","","* integramos el trabajo de las ramas específicas a `master`, y","* pusheamos y pulleamos del remoto"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Refresquemos un poco cómo actualizar `master` y pushear nuestro trabajo."],afterMarkdowns:["Acá ejecutamos dos comandos que:","","* rebasearon nuestro trabajo sobre los nuevos commits del remoto, y","* publicamos nuestro trabajo en ese remoto"],command:"git pull --rebase; git push",beforeCommand:"git clone; git commit; git fakeTeamwork"}},{type:"ModalAlert",options:{markdowns:["Este nivel es bastante pesado. Acá tenés algunos lineamientos para resolverlo:","","* Tenemos tres ramas específicas -- `side1` `side2` and `side3`","* Queremos pushear cada una de esas ramas, en orden, al remoto","* El remoto fue actualizado, así que vamos a tener que integrar esos cambios también","",":O ¡Intenso! ¡Éxitos! Completar este nivel representa un gran avance."]}}]},es_ES:{childViews:[{type:"ModalAlert",options:{markdowns:["## Haciendo merge con ramas de trabajo","","Ahora que estás cómodo fetcheando, pulleando y pusheando, pongamos a prueba estas habilidades con un nuevo flujo de trabajo.","","Es bastante común que los desarrolladores en los grandes proyectos trabajen sobre ramas específicas para cada tarea (feature branches o ramas de trabajo) basadas en `master`, y que las integren sólo cuando estén listas. Esto es similar a la lección anterior, en la que hicimos push de las ramas periféricas al remoto, pero aquí tenemos un paso más.","","Algunos desarrolladores sólo pushean y pullean cuando están en `master`: de ese modo, `master` siempre se mantiene actualizado con el remoto (`o/master`).","","Entonces, en este flujo de trabajo combinamos dos cosas:","","* integramos el trabajo de las ramas específicas a `master`, y","* pusheamos y pulleamos del remoto"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Refresquemos un poco cómo actualizar `master` y pushear nuestro trabajo."],afterMarkdowns:["Ahora ejecutamos dos comandos que:","","* rebasearon nuestro trabajo sobre los nuevos commits del remoto, y","* publicamos nuestro trabajo en ese remoto"],command:"git pull --rebase; git push",beforeCommand:"git clone; git commit; git fakeTeamwork"}},{type:"ModalAlert",options:{markdowns:["Este nivel es bastante pesado. Aquí tienes algunas ideas para resolverlo:","","* Tenemos tres ramas específicas -- `side1` `side2` and `side3`","* Queremos hacer push de cada una de esas ramas, en orden, al remoto","* El remoto fue actualizado, así que vamos a tener que integrar esos cambios también","",":O ¡Genial! ¡Éxito! Completar este nivel representa un gran avance."]}}]},pt_BR:{childViews:[{type:"ModalAlert",options:{markdowns:["## Merge de ramos de funcionalidades","","Agora que você está confortável com fetch, pull e push, vamos colocar essas habilidades em teste com um novo fluxo de trabalho.","","É comum para desenvolvedores de grande projetos fazer todo o trabalho em ramos de funcionalidades (fora do `master`) e então integrar esse trabalho uma única vez quando ele estiver pronto. Isso é similar à lição anterior (onde ramos laterais eram enviados ao repositório remoto), mas introduzimos mais um passo.","","Alguns desenvolvedores só fazem push e pull quando no ramo `master` -- desta forma o `master` sempre se mantém atualizado com aquilo que está no ramo remoto (`o/master`).","","Então, para este fluxo de trabalho, combinaremos duas coisas:","","* Integrar ramos de funcionalidade no `master`, e","* Realizar push e pull do repositório remoto"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Vamos refrescar a memória sobre como atualizar o `master` e enviar trabalho."],afterMarkdowns:["Nós executamos dois comandos aqui que:","","* Fizeram rebase de nosso trabalho nos novos commits do repositório remoto, e","* Publicaram nosso trabalho no repositório remoto"],command:"git pull --rebase; git push",beforeCommand:"git clone; git commit; git fakeTeamwork"}},{type:"ModalAlert",options:{markdowns:["Esse nível é um pouco pesado -- aqui está a linha geral de como resolver:","","* Há três ramos de funcionalidades -- `side1`, `side2` e `side3`","* Queremos enviar cada uma dessas funcionalidades, em ordem, para o repositório remoto","* O repositório remoto foi atualizado desde então, então também precisaremos incorporar o trabalho realizado lá","",":O intenso! boa sorte, completar este nível é um grande passo."]}}]},gl:{childViews:[{type:"ModalAlert",options:{markdowns:["## Mesturando ramas","","Agora que estás afeito a descargar, mesturar e empurrar, poñamos a proba estas habilidades cun novo fluxo de traballo.","","É bastante común que os desenvolvedores nos grandes proxectos traballen sobre ramas específicas para cada tarefa (feature branches) baseadas en `mater`, e que as integren só cando están preparadas. Esto é similar á lección anterior, na que empurrábamos as ramas periféricas ó remoto, pero acá temos un paso máis.","","Algúns desenvovledores só empurran e descargan cando están en `master`: de ese xeito, `master` sempre mantén actualizado o seu estado co remoto (`o/master`).","","Entón, neste fluxo de traballo combinamos dúas cousas:","","* integramos o traballo das ramas específicas a `master`, e","* empurramos e turramos do remoto"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Refresquemos un pouco cómo actualizar `master` e empurrar o noso traballo."],afterMarkdowns:["Agora executamos dous comandos que:","","* rebasamos o noso traballo sobre os novos commits do remoto, e","* publicamos o noso traballo nese remoto"],command:"git pull --rebase; git push",beforeCommand:"git clone; git commit; git fakeTeamwork"}},{type:"ModalAlert",options:{markdowns:["Este nivel é bastante pesado. Aquí tes algúns patróns para resolvelo:","","* Temos tres ramas específicas -- `side1` `side2` e `side3`","* Queremos empurrar cada unha de esas ramas, en orde, ó remoto","* O remoto foi actualizado, así que imos ter que integrar eses cambios tamén","",":O ¡Intenso! ¡Éxitos! Completar este nivel representa un grande avance."]}}]},zh_TW:{childViews:[{type:"ModalAlert",options:{markdowns:["## merge feature branch","","現在你已經很熟悉 fetch、pull 以及 push，讓我們來針對一個新的問題來應用這些技巧。","","在一個大型的專案裡面，程式設計師經常會在 feature branch（有別於 master branch）上面做開發，之後等開發完之後，在一次 merge 回去。這跟之前的課程是很類似的（其它的 branch 被 push 到 remote），但是現在我們還要再多介紹一個步驟。","","某些程式設計師只針對 `master` branch 進行 push 或者是 pull。這樣子的話 `master` 一直都保持跟 remote （`o/master`） 同步。","","所以針對這個問題我們結合了兩件事情：","","* merge feature branch 到`master` branch，並且","* push remote 以及 pull remote"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["讓我們馬上來實際看一下如何更新 `master` 並且 push 到 remote。"],afterMarkdowns:["我們在這裡執行兩個指令:","","* rebase 我們的 branch 到 remote 的新的 commit 上面，並且","* 發佈到 remote 上面"],command:"git pull --rebase; git push",beforeCommand:"git clone; git commit; git fakeTeamwork"}},{type:"ModalAlert",options:{markdowns:["這個關卡很複雜，這裡有一些提示：","","* 總共有三個 feature branch，分別是 `side1`，`side2` 以及 `side3`","* 我們想要將這三個 branch 分別 push 到 remote。","* 但是 remote 已經被事先更新過了，所以我們必須要先同步那些更新。","",":O 很好！祝你好運，完成這個關卡是一個很重要的步驟。"]}}]},de_DE:{childViews:[{type:"ModalAlert",options:{markdowns:["## Einen Feature Branch reintegrieren","","Nun da du mit `fetch`, `pull`, und `push` vertraut bist sollten wir diese Fähigkeiten mit einem neuen Arbeitsablauf auf die Probe stellen.","","Für Entwickler in großen Projekten ist es nicht ungewöhnlich ihre Arbeit in Feature Branches (von `master` abgeleitet) zu erledigen und dann diese Inhalte zu reintegrieren, wenn sie fertig sind. Das ist ähnlich dem vorherigen Level (in dem ein Feature Branch auf den Server geschoben wird), nur mit einem zusätzlichen Schritt.","","Einige Entwickler pushen und pullen nur auf dem `master` -- dadurch ist `master` immer aktuell zu seinem Gegenstück auf dem Server (`o/master`).","","Für diesen Ablauf werden wir also zwei Dinge kombinieren:","","* einen Feature Branch in `master` reintegrieren und","* vom entfernten Server pushen und pullen."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Schauen wir uns zur Erinnerung schnell noch mal an wie man den `master` aktualisiert und seine Commits pusht."],afterMarkdowns:["Wir haben hier zwei Befehle ausgeführt, die:","","* unsere Commits auf die neuen Commits vom Server gepackt und","* unsere Commits zum Server gepusht haben."],command:"git pull --rebase; git push",beforeCommand:"git clone; git commit; git fakeTeamwork"}},{type:"ModalAlert",options:{markdowns:["Dieser Level ist ziemlich heftig -- hier ist im Groben der Weg:","","* Es gibt drei Feature Branches -- `side1`, `side2` und `side3`.","* Wir möchten jedes dieser Features, in dieser Reihenfolge, auf den Server bringen.","* Der Server hat Commits, die wir noch nicht haben, diese müssen also bei uns integriert werden.","",":O Krass! Viel Erfolg, diesen Level zu schaffen ist ein großer Schritt."]}}]},zh_CN:{childViews:[{type:"ModalAlert",options:{markdowns:["## 合并特性分支","","既然你应该很熟悉 fetch、pull、push 了，现在我们要通过一个新的工作流来测试你的这些技能。","","在大型项目中开发人员通常会在（从 `master` 上分出来的）特性分支上工作，工作完成后只做一次集成。这跟前面课程的描述很相像（把 side 分支推送到远程仓库），不过本节我们会深入一些.","","但是有些开发人员只在 master 上做 push、pull —— 这样的话 master 总是最新的，始终与远程分支 (o/master) 保持一致。","","对于接下来这个工作流，我们集成了两个步骤：","","* 将特性分支集成到 `master` 上","* 推送并更新远程分支"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["让我们看看如何快速的更新 `master` 分支并推送到远程。"],afterMarkdowns:["我们执行了两个命令: ","","* 将我们的工作 rebase 到远程分支的最新提交记录","* 向远程仓库推送我们的工作"],command:"git pull --rebase; git push",beforeCommand:"git clone; git commit; git fakeTeamwork"}},{type:"ModalAlert",options:{markdowns:["这个关卡的 Boss 很厉害 —— 以下是通关提示：","","* 这里共有三个特性分支 —— `side1` `side2` 和 `side3`","* 我需要将这三分支按顺序推送到远程仓库","* 因为远程仓库已经被更新过了，所以我们还要把那些工作合并过来","",":O 紧张了？祝你好运！完成了本关, 你就向目标又迈近了一大步啦！"]}}]},ru_RU:{childViews:[{type:"ModalAlert",options:{markdowns:["## Слияние фича-бранчей (веток)","","Теперь, когда вы умело владеете командами fetch, pull и push, давайте применим эти навыки в сочетании с новым рабочим процессом (он же workflow).","","Среди разработчиков, вовлечённых в большой проект, довольно распространённ приём — выполнять всю свою работу в так называемых фича-бранчах (вне `master`). А затем, как только работа выполнена, разработчик интегрирует всё, что было им сделано. Всё это, за исключением одного шага, похоже на предыдущий урок (там, где мы закачивали ветки на удалённый репозиторий)","","Ряд разработчиков делают push и pull лишь на локальную ветку `master` - таким образом ветка `master` всегда синхронизирована с тем, что находится на удалённом репозитории (`o/master`).","","Для этого рабочего процесса мы совместили две вещи:","","* интеграцию фича-бранчей в `master`","* закачку (push) и скачку (pull) с удалённого репозитория"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Давайте быстренько вспомним, как нам обновить `master` и закачать выполненную работу."],afterMarkdowns:["Здесь мы выполнили две команды, которые:","","* перебазировали нашу работу на новенький коммит, пришедший с удалённого репозитория, и","* закачали свои наработки в удалённый репозиторий"],command:"git pull --rebase; git push",beforeCommand:"git clone; git commit; git fakeTeamwork"}},{type:"ModalAlert",options:{markdowns:["Текущая задача является достаточно обильной - здесь представлена общая схема выполнения:","","* Есть три фича-бранчи (фича-ветки) - `side1` `side2` и `side3`","* Нам необходимо закачать каждую из них по очереди на удалённый репозиторий","* При этом удалённый репозиторий хранит в себе какие-то наработки, которые также следует скачать к себе","",":O Сложно! Желаю вам удачи в выполнении этой непростой задачи."]}}]},ja:{childViews:[{type:"ModalAlert",options:{markdowns:["## 機能別のブランチ（フィーチャーブランチ）をマージする","","今や、あなたは`fetch`、`pull`、`push`を十分に使えるようになったでしょうから、そのスキルを新しい作業の流れで試してみましょう。","","大きなプロジェクトの開発者にとって、フィーチャーブランチ（`master`を除く）上で全ての作業を行い、完成したら一度でその作業を統合するというような流れが一般的です。これは前のレッスンの内容（他のブランチからリモートにプッシュされるような状況のところが）に似ていますが、ここではもう一歩踏み込んで解説しましょう。","","開発者は、`master`ブランチにいるときプッシュとプルしかしません -- `master`は常にリモート(`o/master`）に追従した状態のままにします。","","この作業の流れでは、私たちは二つのことを組み合わせています:","","* `master`にフィーチャーブランチの作業を統合し、","* リモートへの`push`と`pull`を行う"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["`master`の更新と作業の反映の方法を手早く復習しましょう。"],afterMarkdowns:["我々はここで二つのコマンドを動かしました:","","* リモートから新しいコミットを我々の作業にリベースし、","* リモートに我々の作業を公開しました"],command:"git pull --rebase; git push",beforeCommand:"git clone; git commit; git fakeTeamwork"}},{type:"ModalAlert",options:{markdowns:["このレベルはかなり難しいです -- ここに解答の一般的な道のりを示しておきます:","","* 三つのフィーチャーブランチ、`side1`、`side2`、`side3`があります。","* この機能をそれぞれ、この順に、リモートにプッシュしてください。","* リモートが更新されたなら、次はより良く作業を統合する方法を紹介しましょう。","",":O これはきつそうだ！このレベルを完了させることは大きな一歩となります。幸運を祈ります。"]}}]},ko:{childViews:[{type:"ModalAlert",options:{markdowns:["## feature 브랜치 병합하기","","이제 여러분은 fetch, pull, push하는데에 익숙해졌을겁니다. 연마한 기술들을 새로운 상황에서 시험 해봅시다.","","개발자들은 주로 큰 프로젝트를 개발할때 작업을 feature 브랜치(=토픽브랜치 / `master`브랜치가 아닌 작업을위해 임시로 만든 브랜치를 말합니다)들에 하고 준비가 되면 그 작업을 통합합니다. 이전 강의와 비슷한 모습인데(사이드 브랜치들을 원격저장소로 push한것), 여기서 한 단계 더 나아가 봅시다. ","","어떤 개발자들은 `master` 브랜치에 있을때만 push와 pull을 수행합니다 -- 이렇게하면 `master`는 항상 원격 브랜치 (`o/master`)의 상태와 항상 최신의 상태로 유지될 수 있습니다.","","이런 작업흐름은 두가지 작업을 같이하게됩니다 :","","* feature 브랜치의 작업을 master로 통합하는것과","* 원격저장소에서 push하고 pull하는 작업입니다"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["다음을 보고 `master`를 갱신하고 작업을 push하는 방법을 다시 떠올려봅시다."],afterMarkdowns:["여기서 우리는 두개의 명령어를 실행 했습니다 :","","* 우리의 작업을 원격 저장소의 새 커밋들로 리베이스한 후","* 우리 작업을 원격저장소로 push했습니다."],command:"git pull --rebase; git push",beforeCommand:"git clone; git commit; git fakeTeamwork"}},{type:"ModalAlert",options:{markdowns:["이번 레벨은 꽤 덩치가 큽니다 -- 문제에대한 대략적인 설명을 해드리겠습니다 :","","* 세개의 feature 브랜치가 있습니다 -- `side1`, `side2` 그리고 `side3` 가 있습니다.","* 각각의 브랜치를 순서에 맞게 원격 저장소로 push하고 싶습니다.","* 원격 저장소가 최근에 갱신된적이 있기때문에 그 작업또한 포함시켜야 합니다.","",":O 이야 할게 많습니다! 행운을 빕니다, 이번 레벨은 많은걸 요구합니다."]}}]},uk:{childViews:[{type:"ModalAlert",options:{markdowns:["## Мердж гілок з фічами","","Тепер, коли ти вже впевнено володієш засобами `pull` та `push`, час перевірити ці знання в новому процесі.","","Зазвичай розробники працюють над якимось фічами в окремій гілці (не в `master`), а потім, коли роботу закінчено, інтегрують її. Це схоже на попередній урок (де окремі гілки пушили у віддалений репозиторій), але тут буде ще один додатковий крок.","","Деякі розробники виконують push і pull лише в гілці `master` -- тож `master` завжди буде актуальним і синхронізованим з віддаленою гілкою (`o/master`).","","Отже для цього процесу ми об'єднуємо дві речі:","","* інтеграцію гілки з фічею в `master`, і","* пул та пуш для синхронізації з віддаленим репозиторієм"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Пригадаймо коротко як оновити `master` і запушити свої зміни."],afterMarkdowns:["Ми виконали дві команди, які:","","* заребейсили нашу роботу поверх віддалених комітів, і","* опублікували наші зміни у віддаленому репозиторії"],command:"git pull --rebase; git push",beforeCommand:"git clone; git commit; git fakeTeamwork"}},{type:"ModalAlert",options:{markdowns:["Цей рівень доволі величенький -- ось, що треба буде зробити:","","* Є три гілки з фічами -- `side1` `side2` та `side3`","* Ми хочемо запушити кожну з них по черзі у віддалений репозиторій","* Віддалений репозиторій теж змінився, тож нам потрібно об'єднати всі ці зміни","",":O Чимале завдання! Успіху! Виконання цього рівня буде великим кроком."]}}]},vi:{childViews:[{type:"ModalAlert",options:{markdowns:["## Sáp nhập các nhánh tính năng","","Giờ thì bạn đã quen thuộc với tìm nạp, kéo và đẩy, bây giờ chúng tôi sẽ kiểm tra kỹ năng của bạn với một quy trình làm việc mới.","","Trong các dự án lớn, các nhà phát triển thường làm việc trên các nhánh tính năng (được phân nhánh từ `master`) và chỉ thực hiện tích hợp sau khi công việc hoàn thành. Điều này tương tự như mô tả trong bài học trước (đẩy nhánh bên sang kho lưu trữ từ xa), nhưng chúng ta sẽ đi sâu hơn một chút trong phần này.","","Một vài nhà phát triển chỉ thực hiện đẩy và kéo khi ở trên nhánh `master` -- như vậy thì nhánh `master` luôn luôn được cập nhật với nhánh từ xa (`o/master`).","","Vậy nên với quy trình làm việc này chúng tôi đã kết hợp 2 việc:","","* tích hợp nhánh chức năng lên nhánh `master`, và","* đẩy và kéo từ nhánh từ xa"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Hãy xem qua cách cập nhật nhánh `master` và đẩy lên nhánh từ xa hoạt động như thế nào."],afterMarkdowns:["Ta thực thi 2 câu lệnh làm việc sau:","","* tái bố trí (`rebase`) thành quả của ta lên commit của nhánh từ xa, và","* xuất bản thành quả của ta lên nhánh từ xa"],command:"git pull --rebase; git push",beforeCommand:"git clone; git commit; git fakeTeamwork"}},{type:"ModalAlert",options:{markdowns:["Cấp độ này khá là phức tạp đấy -- để hoàn thành thì hãy xem qua hướng dẫn cơ bản sau:","","* Có 3 nhánh chức năng là -- `side1` `side2` vả `side3`","* Chúng tôi muốn bạn đẩy từng nhánh chức năng, theo thứ tự, lên nhánh từ xa","* Nhánh từ xa cũng đã được cập nhật, nên ta cũng cần sát nhập thay đổi đó nữa","",":O khoai đây! Cố lên nhé, hoàn thành cấp độ này là lên trình nhiều lắm đấy."]}}]}}}},{}],144:[function(e,t,o){o.level={goalTreeString:'{"branches":{"master":{"target":"C3","id":"master"},"o/master":{"target":"C1","id":"o/master"}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"},"C3":{"parents":["C1"],"id":"C3"},"C4":{"parents":["C1"],"id":"C4"}},"HEAD":{"target":"C4","id":"HEAD"},"originTree":{"branches":{"master":{"target":"C2","id":"master"}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"},"C2":{"parents":["C1"],"id":"C2"}},"HEAD":{"target":"master","id":"HEAD"}}}',solutionCommand:"git commit;git checkout o/master;git commit",startTree:'{"branches":{"master":{"target":"C1","id":"master"},"o/master":{"target":"C1","id":"o/master"}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"}},"HEAD":{"target":"master","id":"HEAD"},"originTree":{"branches":{"master":{"target":"C2","id":"master"}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"},"C2":{"parents":["C1"],"id":"C2"}},"HEAD":{"target":"master","id":"HEAD"}}}',name:{en_US:"Remote Branches",zh_CN:"远程分支",zh_TW:"remote branch （遠端分支）",es_AR:"Ramas remotas",es_ES:"Ramas remotas",pt_BR:"Ramos remotos",gl:"Ramas remotas",de_DE:"Branches auf entfernten Servern",ja:"リモートのブランチ",fr_FR:"Les branches distantes",ru_RU:"Удалённые ветки",ko:"원격 브랜치(remote branch)",uk:"Віддалені гілки",vi:"Nhánh từ xa"},hint:{en_US:"Pay attention to the ordering -- commit on master first!",zh_CN:"注意顺序 —— 先在 master 分支上提交!",zh_TW:"注意順序的問題喔！先在 master branch 上面送 commit",es_AR:"Prestá atención al orden: ¡commiteá sobre master primero!",es_ES:"Presta atención al orden: ¡haz commit sobre master primero!",pt_BR:"Preste atenção na ordem: commite no master primeiro!",gl:"Preta atención á orde: fai commit no master primeiro",de_DE:"Beachte die Sortierung -- committe zuerst auf dem master!",ja:"順番に注意 -- まずmasterに対してcommitしましょう",fr_FR:"Prêtez attention à l'ordre -- les commits sur master d'abord !",ru_RU:"Уделяйте внимание очерёдности -- сперва commit на master",ko:"순서에 주의하세요 -- master에서 먼저 커밋하세요!",uk:"Звертайте увагу на послідовність -- спочатку коміт в мастер!",vi:"Chú ý đến thứ tự -- commit trên nhánh master trước!"},startDialog:{en_US:{childViews:[{type:"ModalAlert",options:{markdowns:["## Git Remote Branches","","Now that you've seen `git clone` in action, let's dive into what actually changed.","","The first thing you may have noticed is that a new branch appeared in our local repository called `o/master`. This type of branch is called a _remote_ branch; remote branches have special properties because they serve a unique purpose.","","Remote branches reflect the _state_ of remote repositories (since you last talked to those remote repositories). They help you understand the difference between your local work and what work is public -- a critical step to take before sharing your work with others.","","Remote branches have the special property that when you check them out, you are put into detached `HEAD` mode. Git does this on purpose because you can't work on these branches directly; you have to work elsewhere and then share your work with the remote (after which your remote branches will be updated)."]}},{type:"ModalAlert",options:{markdowns:["### What is `o/`?","","You may be wondering what the leading `o/` is for on these remote branches. Well, remote branches also have a (required) naming convention -- they are displayed in the format of:","","* `<remote name>/<branch name>`","","Hence, if you look at a branch named `o/master`, the branch name is `master` and the name of the remote is `o`.","","Most developers actually name their main remote `origin`, not `o`. This is so common that git actually sets up your remote to be named `origin` when you `git clone` a repository.","","Unfortunately the full name of `origin` does not fit in our UI, so we use `o` as shorthand :( Just remember when you're using real git, your remote is probably going to be named `origin`!","","That's a lot to take in, so let's see all this in action."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Lets check out a remote branch and see what happens"],afterMarkdowns:["As you can see, git put us into detached `HEAD` mode and then did not update `o/master` when we added a new commit. This is because `o/master` will only update when the remote updates."],command:"git checkout o/master; git commit",beforeCommand:"git clone"}},{type:"ModalAlert",options:{markdowns:["To finish this level, commit once off of `master` and once after checking out `o/master`. This will help drive home how remote branches behave differently, and they only update to reflect the state of the remote."]}}]},fr_FR:{childViews:[{type:"ModalAlert",options:{markdowns:["## Les branches distantes de git","","Maintenant que nous avons vu `git clone` en action, plongeons dans ce qui a changé.","","La première chose que vous avez peut-être remarqué est qu'une nouvelle branche est apparue dans votre dépôt local appelée `o/master`. Ce type de branche est appelée une branche _distante_ ; les branches distantes ont des propriétés spécifiques car elles servent à un but précis.","","Les branches distantes reflètent _l'état_ des dépôts distants (depuis la dernière fois où vous avez parlé avec ceux-ci). Elles vous aident à comprendre les différences entre votre travail et le travail public -- une étape critique à effectuer avant de partager son travail avec les autres.","","Les branches distantes ont une propriété particulière: quand vous vous rendez dessus (checkout), `HEAD` est détaché. Git fait cela car vous ne pouvez pas travailler sur ces branches directement ; vous devez travailler ailleurs et ensuite partager votre travail avec le dépôt distant (après quoi vos branches distantes seront mises à jour)."]}},{type:"ModalAlert",options:{markdowns:["### Qu'est-ce que `o/`?","","Vous vous demandez peut-être ce qu'est le préfixe `o/` devant ces branches distantes. En pratique, les branches distantes ont aussi une convention de nommage (obligatoire) -- elles sont affichées avec le format :","","* `<nom dépôt distant>/<nom de la branche>`","","Donc, si vous regardez une branche nommée `o/master`, le nom de la branche est `master` et le nom du dépôt distant est `o`.","","La plupart des développeurs nomment leur principal dépôt distant `origin`, pas `o`. C'est si commun que git configure en fait votre dépôt local pour être nommé `origin` quand vous faîtes un `git clone` du dépôt.","","Malheureusement le nom complet `origin` ne rentre pas dans notre interface graphique et nous utilisons donc `o` comme raccourci :( Rappelez-vous juste que quand vous utilisez le vrai git, votre dépôt distant est probablement nommé `origin`!","","Cela fait beaucoup d'un coup, donc voyons cela en action."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Rendons-nous sur une branche et regardons ce qui se passe"],afterMarkdowns:["Comme vous pouvez le voir, git nous a mis dans le mode \"detached\" (cf. `HEAD`) puis n'a pas mis à jour `o/master` quand nous avons ajouté un nouveau commit. C'est parce que `o/master` va se mettre à jour uniquement quand le dépôt distant sera mis à jour."],command:"git checkout o/master; git commit",beforeCommand:"git clone"}},{type:"ModalAlert",options:{markdowns:["Pour finir ce niveau, faîtes un commit en dehors de `master` puis un après vous être rendu dans `o/master`. Cela va nous aider à comprendre la différence de comportement des branches distantes, et le fait qu'elles se mettent à jour uniquement pour refléter l'état du dépôt distant."]}}]},es_AR:{childViews:[{type:"ModalAlert",options:{markdowns:["## Ramas remotas de git","","Ahora que viste `git clone` en acción, ahondemos en lo que realmente cambió.","","Lo primero que habrás notado es que apareció una nueva rama en tu repositorio local llamada `o/master`. A este tipo de ramas se las llama ramas _remotas_. Las ramas remotas tienen propiedades especiales porque sirven un propósito específico.","","Las ramas remotas reflejan el _estado_ de los repositorios remotos (cómo estaban la última vez que hablaste con ellos). Te ayudan a entender las diferencias entre tu trabajo local y el trabajo que ya está publicado - un paso crítico antes de compartir tu trabajo con los demás.","","Las ramas remotas tienen la propiedad especial de que cuando las checkouteás, pasás al modo detached `HEAD`. Git lo hace a propósito porque no podés trabajar en esas ramas directamente: tenés que trabajar en algún otro lado y después compartir tu trabajo con el remoto (tras lo que tus ramas remotas se actualizarán)."]}},{type:"ModalAlert",options:{markdowns:["### ¿Qué es `o/`?","","Podrías estar preguntándote qué significa ese `o/` al principio de las ramas remotas. Bueno, las ramas remotas también tienen una convención de nombres obligatoria -- se las muestra con el formato:","","* `<nombre del remoto>/<nombre de la rama>`","","Entonces, si mirás una rama llamada `o/master`, el nombre de la rama es `master`, y el nombre del remoto es `o`.","","La mayoría de los desarrolladores llaman `origin` a su remoto en lugar de `o`. Esto es tan común que git efectivamente crea tu remoto llamándolo `origin` cuando hacés `git clone` de un repositorio.","","Desafortunadamente el nombre `origin` completo no entra en nuestra UI, así que usamos `o` para abreviar :( Simplemente recordá que cuando uses el git real, tu remoto ¡probablemente se llame `origin`!","","Hay mucho para procesar, así que veámoslo en acción."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Checkouteemos una rama remota a ver qué pasa"],afterMarkdowns:["Como ves, git nos puso en el modo detached `HEAD` y no actualizó `o/master` cuando creamos un nuevo commit. Esto es porque `o/master` sólo va a actualizarse cuando el remoto se actualice."],command:"git checkout o/master; git commit",beforeCommand:"git clone"}},{type:"ModalAlert",options:{markdowns:["Para completar este nivel, commiteá una vez sobre `master` y una después de checkoutear `o/master`. Esto te va a ayudar a caer en cómo las ramas remotas funcionan distinto, y que sólo se actualizan para reflejar el estado del remoto."]}}]},es_ES:{childViews:[{type:"ModalAlert",options:{markdowns:["## Ramas remotas de git","","Ahora que viste `git clone` en acción, ahondemos en lo que realmente cambió.","","Lo primero que habrás notado es que apareció una nueva rama en tu repositorio local llamada `o/master`. A este tipo de ramas se las llama ramas _remotas_. Las ramas remotas tienen propiedades especiales porque sirven un propósito específico.","","Las ramas remotas reflejan el _estado_ de los repositorios remotos (cómo estaban la última vez que hablaste con ellos). Te ayudan a entender las diferencias entre tu trabajo local y el trabajo que ya está publicado - un paso crítico antes de compartir tu trabajo con los demás.","","Las ramas remotas tienen la propiedad especial de que cuando haces checkout sobre ellas, pasas al modo detached `HEAD`. Git lo hace a propósito porque no puedes trabajar en esas ramas directamente: tienes que trabajar en algún otro lado y después compartir tu trabajo con el remoto (tras lo que tus ramas remotas se actualizarán)."]}},{type:"ModalAlert",options:{markdowns:["### ¿Qué es `o/`?","","Podrías estar preguntándote qué significa ese `o/` al principio de las ramas remotas. Bueno, las ramas remotas también tienen una convención de nombres obligatoria -- se muestran con el formato:","","* `<nombre del remoto>/<nombre de la rama>`","","Entonces, si observas una rama llamada `o/master`, el nombre de la rama es `master`, y el nombre del remoto es `o`.","","La mayoría de los desarrolladores llaman `origin` a su remoto en lugar de `o`. Esto es tan común que git efectivamente crea tu remoto llamándolo `origin` cuando haces `git clone` de un repositorio.","","Desafortunadamente el nombre `origin` completo no entra en nuestra UI (interfaz de usuario), así que usamos `o` para abreviar :(Simplemente recuerda que cuando uses el git real, tu remoto ¡probablemente se llame `origin`!","","Queda mucho por aprender, así que veámoslo en acción."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Hagamos checkout sobre una rama remota a ver qué pasa"],afterMarkdowns:["Como ves, git nos puso en el modo detached `HEAD` y no actualizó `o/master` cuando creamos un nuevo commit. Esto ocurre porque `o/master` sólo va a actualizarse cuando el remoto se actualice."],command:"git checkout o/master; git commit",beforeCommand:"git clone"}},{type:"ModalAlert",options:{markdowns:["Para completar este nivel, haz commit una vez sobre `master` y otra vez después de checkoutear `o/master`. Esto te va a ayudar a aprender cómo las ramas remotas funcionan distinto, y que sólo se actualizan para reflejar el estado del remoto."]}}]},pt_BR:{childViews:[{type:"ModalAlert",options:{markdowns:["## Ramos Remotos no Git","","Agora que vimos o `git clone` em ação, vamos estudar aquilo que realmente mudou.","","A primeira coisa que você pode ter percebido é que um novo ramo chamado `o/master` aparece no nosso repositório local. Esse tipo de ramo é chamado de ramo _remoto_; ramos remotos possuem propriedades especiais pois eles servem a um propósito único.","","Ramos remotos refletem o _estado_ de repositórios remotos (desde a última vez na qual você falou com eles). Eles ajudam a entender as diferenças entre o trabalho local e o trabalho atualmente público -- um passo crítico a ser dado antes de compartilhar seu trabalho com os outros.","",'Ramos remotos possuem a propriedade especial de, ao sofrerem um checkout, colocarem o repositório em modo "Detached HEAD". O Git faz isso de propósito, porque você não pode trabalhar nesses ramos diretamente; você é obrigado a trabalhar em outro lugar e só então compartilhar seu trabalho com o remoto (depois disso, os ramos remotos serão atualizados).']}},{type:"ModalAlert",options:{markdowns:["### O que é `o/`?","","Você pode estar se perguntando o que o `o/` no início do nome dos ramos remotos significa. Bem, ramos remotos possuem uma convenção obrigatória de nomes -- eles são mostrados no seguinte formato:","","* `<nome do repositório remoto>/<nome do ramo>`","","Então, se o ramo remoto é chamado `o/master`, o nome do ramo é `master` e o nome do repositório remoto é `o`.","","A maioria dos desenvolvedores na verdade chama o repositório remoto principal de `origin`, e não de `o`. Isso é tão comum que o Git define por padrão o nome `origin` para o repositório remoto quando você usa o comando `git clone` para clonar um repositório.","","Infelizmente o nome completo `origin` não cabe na nossa tela, então usamos `o` como uma abreviação :( Apenas lembre-se que no Git de verdade, o repositório remoto provavelmente será chamado `origin` em vez de `o`!","","É muita informação de uma só vez, então vamos dar uma pausa e ver um pouco de ação."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Vamos fazer checkout de um ramo remoto e ver o que acontece"],afterMarkdowns:['Como você pode ver, o Git nos colocou no modo "Detached HEAD", e não atualizou o `o/master` quando adicionamos um novo commit. Isso é porque o `o/master` só será atualizado quando o repositório remoto for atualizado.'],command:"git checkout o/master; git commit",beforeCommand:"git clone"}},{type:"ModalAlert",options:{markdowns:["Para completar este nível, commite uma vez em `master`, e outra vez depois de fazer checkout em `o/master`. Isso vai ajudá-lo a sentir como os ramos remotos se comportam de forma diferente, e como eles apenas se atualizam para refletir o estado do repositório remoto."]}}]},gl:{childViews:[{type:"ModalAlert",options:{markdowns:["## Ramas remotas de git","","Agora que viches `git clone` en acción, mergullémonos no que realmente mudou.","","O primeiro que notarías é que apareceu unha nova rama no teu repositorio local chamada `o/master`. A este tipo de ramas chámaselle ramas _remotas_. As ramas remotas teñén propiedades especiais porque serven para un propósito específico.","","As ramas remotas reflexan o _estado_ dos repositorios remotos (como estaban á última vez que falaches con eles). Axúdante a entender as diferencias entre o teu traballo local e o teu traballo que xa está publicado - un paso crítico antes de compartir o teu traballo cos demáis.","","As ramas remotas teñen a propiedade especial de que cando fas checkout, pasas o modo detached `HEAD`. Git faino a drede porque non podes traballar nesas ramas directamente: tes que traballar nalgún outro lado e despois compartir o teu traballo co remoto (tras o que as túas ramas remotas actualizaranse)."]}},{type:"ModalAlert",options:{markdowns:["### ¿Qué é `o/`?","","Poderías estar a preguntarte qué significa ese `o/` ó principio das ramas remotas. Bueno, as ramas remotas tamén teñen unha convención de nomes obligatoria -- se as amosas co formato:","","* `<nome do remoto>/<nome da rama>`","","Entonces, se miras unha rama chamada `o/master`, o nome da rama é `master`, e o nome do remoto é `o`.","","A maioría dos desenvolvedores chaman `origin` ó seu remoto no lugar de `o`. Esto é tan común que git efectivamente crea o teu remoto chamandoo `origin` cando fas `git clone` dun repositorio.","","Desafortunadamente o nome `origin` completo non entra na nosa  UI, así que empregaremos `o` para acortar: (Sinxelamente recorda que cando uses git na vida real, o teu remote ¡probablemente se chame `origin`!)","","Hai moito para procesar, así que vexámolo en acción."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Fagamos checkout a unha rama remota a ver qué pasa"],afterMarkdowns:["Como ves, git púxonos no modo detached `HEAD` e non actualizou `o/mater` cando creamos un novo commit. Esto é porque `o/mater` só vai actualizarse cando o remoto se actualice."],command:"git checkout o/master; git commit",beforeCommand:"git clone"}},{type:"ModalAlert",options:{markdowns:["Para completar este nivel, fai commit unha vez sobre `mater` e despois de facer o checkout a `o/master`. Esto vaite axudar a entender cómo funcionan as ramas remotas, e que só se actualizan para reflexar o estado do remoto."]}}]},zh_TW:{childViews:[{type:"ModalAlert",options:{markdowns:["## git remote branch","","現在你已經知道 `git clone` 在幹嘛了，讓我們仔細看看到底發生了什麼事。","","你首先看到的是在你的本地端（local repository）出現了一個新的 branch 叫作 `o/master`，這種型態的 branch 叫作 remote branch （遠端分支），因為特殊的需求，因此 remote branch 有特殊的性質。","","remote branch 反應了 remote repository 的狀態（因為你最後接觸的是這些 remote repository），最重要的是，在你想要分享你的 commit 給其他人時，你必須知道你現在的 commit 跟 remote repository 有哪些不同，而 remote branch 的狀態就是在告訴你這些資訊。","","remote branch 有特別的特性，當你移動到 remote branch 時，你就進入到分離 `HEAD` 的狀態，git 這樣做的原因是告訴你不能夠直接影響這些 branch。你必須要在其它的 branch 工作，並且分享到 remote （分享之後，你的 remote branch 就會被更新）。"]}},{type:"ModalAlert",options:{markdowns:["### 什麼是 `o/`?","","你也許會對於 remote branch 前面的 `o/` 感到困惑，喔！remote branch 也（需要） 一個命名法則，或者是一般表示 remote branch 的格式。","","* `<remote 名稱>/<branch 名稱>`","","因此，當你看到一個 branch 叫做 `o/master`，就表示這個 branch 叫做 master，而且這個 remote 的名稱叫作 `o`。","","很多程式設計師實際上會把他們的 remote 命名為 `origin`，而不是 `o`，這在 git 是很常見的事情，因為當你使用 `git clone` 時，git 會自動把你的 remote 命名為 `origin`。","","但是很不幸的是 `origin` 並沒有辦法完全顯示在我們的 UI 上面，所以我們用 `o` 來簡化它（只要記住當你使用 git 的時候，實際上是命名為 `origin`）。","","有很多事情需要說明，現在讓我們來看看吧！"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["讓我們移動到（checkout）一個 remote branch 並且看一下會發生什麼事情"],afterMarkdowns:["就像你看到的， git 讓我們進到 detached `HEAD` 狀態，同時，當我們加入一個新的 commit 時，`o/master` 都沒有更新，這是因為只有當 remote 更新的時候，`o/master` 才會更新。"],command:"git checkout o/master; git commit",beforeCommand:"git clone"}},{type:"ModalAlert",options:{markdowns:["要完成這一關，先在 master branch 上面做一次 commit，再移動到 `o/master` 上做一次 commit，這有助於我們了解到 remote branch 的不同，它們只會反應 remote 的狀態。"]}}]},de_DE:{childViews:[{type:"ModalAlert",options:{markdowns:["## Branches auf entfernten Servern","","Nun da du `git clone` in Aktion gesehen hast, lass uns tiefer in die Materie eintauchen.","","Das erste, was dir wahrscheinlich aufgefallen ist, ist dass ein neuer Branch in unserem lokalen Repository aufgetaucht ist, namens `o/master`. Diese Art von Branch nennt sich _Remote_ Branch; er hat besondere Eigenschaften, weil er einem bestimmten Zweck dient.","","Ein Remote Branch bildet den Zustand des entsprechenden Branch in einem entfernten Repository ab (dem Zustand in dem der Branch war, als du das letzte mal das entfernte Repository angesprochen hast). Er hilft dir, den Unterschied zwischen deinem lokalen Branch und dem Gegenstück auf dem Server zu sehen -- eine nötige Information, bevor du deine Arbeit mit anderen teilen kannst.","",'Remote Branches besitzen die besondere Eigenschaft dein Repository in den "Detached `HEAD`" Zustand zu versetzen, wenn du sie auscheckst. Git macht das absichtlich so, denn du kannst nicht direkt auf Remote Branches arbeiten; du musst auf Kopien von ihnen arbeiten und deine Änderungen von dort auf den entfernten Server schieben (wonach der Remote Branch dann auch bei dir aktualisiert wird).']}},{type:"ModalAlert",options:{markdowns:["### Was heißt `o/`?","","Du fragst dich vielleicht was das `o/` am Anfang des Namens des Remote Branch bedeuten soll. Nun, Namen von Remote Branches folgen einer (zwingenden) Konvention -- sie werden mit diesem Format gebildet:","","* `<Name des Remote>/<Name des Branches>`","","Wenn du also einen Remote Branch namens `o/master` hast, ist es eine Abbildung des Branches `master` auf dem Server, der in deinem Repository als `o` bekannt ist.","","Die meisten Entwickler nennen das Haupt-Remote tatsächlich `origin` und nicht `o`. Das ist so verbreitet, dass Git den entfernten Server von dem man ein `git clone` macht tatsächlich als `origin` im Clone speichert.","","Leider passt der ganze Name, `origin`, nicht in unsere Darstellung, deshalb benutzen wir hier kurz `o`. :( Merk dir einfach: wenn du echtes Git benutzt werden die Remotes meistens `origin` heißen!","","So, das war eine Menge zu verdauen, schauen wir uns das in Aktion an."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Checken wir mal einen Remote Branch aus und schauen was passiert"],afterMarkdowns:['Wie du siehst setzt uns Git in den "Detached `HEAD`" Modus und aktualisiert dann nach dem Commit nicht den Branch `o/master`. Das liegt daran, dass der Remote Branch nur aktualisiert wird, wenn sich der entsprechende Branch auf dem Remote verändert.'],command:"git checkout o/master; git commit",beforeCommand:"git clone"}},{type:"ModalAlert",options:{markdowns:["Um diesen Level zu bewältigen musst du einen Commit in `master` machen und einen nachdem du `o/master` ausgecheckt hast. Das illustriert noch einmal wie sich Branches und Remote Branches unterschiedlich verhalten und dass letztere sich nur verändern, wenn sich ihr Zustand auf dem entfernten Server ändert."]}}]},zh_CN:{childViews:[{type:"ModalAlert",options:{markdowns:["## 远程分支","","既然你已经看过 `git clone` 命令了，咱们深入地看一下发生了什么。","","你可能注意到的第一个事就是在我们的本地仓库多了一个名为 `o/master` 的分支, 这种类型的分支就叫**远程**分支。由于远程分支的特性导致其拥有一些特殊属性。","","远程分支反映了远程仓库(在你上次和它通信时)的**状态**。这会有助于你理解本地的工作与公共工作的差别 —— 这是你与别人分享工作成果前至关重要的一步.","","远程分支有一个特别的属性，在你检出时自动进入分离 HEAD 状态。Git 这么做是出于不能直接在这些分支上进行操作的原因, 你必须在别的地方完成你的工作, （更新了远程分支之后）再用远程分享你的工作成果。"]}},{type:"ModalAlert",options:{markdowns:["### 为什么有 `o/`？","","你可能想问这些远程分支的前面的 `o/` 是什么意思呢？好吧, 远程分支有一个命名规范 —— 它们的格式是: ","","* `<remote name>/<branch name>`","","因此，如果你看到一个名为 `o/master` 的分支，那么这个分支就叫 `master`，远程仓库的名称就是 `o`。","","大多数的开发人员会将它们主要的远程仓库命名为 `origin`，并不是 `o`。这是因为当你用 `git clone` 某个仓库时，Git 已经帮你把远程仓库的名称设置为 `origin` 了","","不过 `origin` 对于我们的 UI 来说太长了，因此不得不使用简写 `o` :) 但是要记住, 当你使用真正的 Git 时, 你的远程仓库默认为 `origin`! ","","说了这么多，让我们看看实例。"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["如果检出远程分支会怎么样呢？"],afterMarkdowns:["正如你所见，Git 变成了分离 HEAD 状态，当添加新的提交时 `o/master` 也不会更新。这是因为 `o/master` 只有在远程仓库中相应的分支更新了以后才会更新。"],command:"git checkout o/master; git commit",beforeCommand:"git clone"}},{type:"ModalAlert",options:{markdowns:["要通过本关，在 `master` 分支上做一次提交；然后检出 `o/master`，再做一提交。这有助于你理解远程分支的不同，他们的更新只是反映了远程的状态。"]}}]},ja:{childViews:[{type:"ModalAlert",options:{markdowns:["## リモートのブランチ","","あなたは今や`git clone`の動作を知ったことでしょうから、次は実際に詳細を見てみましょう。","","まず、もしかしたらもう気付いているかもしれないですが、私たちのローカルリポジトリにo/masterという名前の新しいブランチが追加されています。このようなブランチは、_リモート_ブランチと呼ばれます。リモートブランチは、その固有の役割を担うために特別なプロパティを持っています。","","リモートブランチは、リモートリポジトリの_状態_を反映します（あなたがそのリモートリポジトリから変更を最後に問い合わせてからの）。","","リモートブランチは、あなたがチェックアウトするとき、`HEAD`が分離された状態になるという特殊な性質を持っています。Gitはこの上での動作を保証しません。なぜこのようになるかというと、リモートブランチ上での直接の作業はできないからなのです。あなたは、別の場所で作業をし、その後でリモートブランチに共有するようにしなければなりません（その後であなたのリモートブランチは更新されます）。"]}},{type:"ModalAlert",options:{markdowns:["### `o/`とは何か?","","あなたは、リモートブランチが`o/`で始まることに驚くかもしれません。そう、リモートブランチには固有の（必要な）命名規則も存在するのです。 -- これは次のようなフォーマットで表示されます:","","* `<リモート名>/<ブランチ名>`","","これに基づいて、`o/master`と名付けられたブランチを見てみると、`master`はブランチの名前、`o`はリモートの名前であることが分かります。","","多くの開発者は、実際にはメインのリモート名として`o`ではなく`origin`を使います。これは一般的には、Gitが`git clone`した時に`origin`という名前をリモートに付与するためです。","","残念ながら、`origin`という長い名前は私たちのUIには合いませんでした。なので、私たちは短い`o`を使っています（覚えておいてもらいたいのは、実際のGitでは、リモートはおそらく`origin`と名付けられるであろうということです！）","","理解すべきことはたくさんあるので、ひとまず全ての動作を見てみましょう。"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["リモートブランチをチェックアウトすると何が起こるかを見てみましょう"],afterMarkdowns:["見ていた通り、`o/master`に移ってから新しいコミットをしても`HEAD`が分離状態になり`o/master`は更新されていません。これは、`o/master`がリモートの更新時のみ更新されるからです。"],command:"git checkout o/master; git commit",beforeCommand:"git clone"}},{type:"ModalAlert",options:{markdowns:["このレベルを終えるには、まずコミットを`master`に一回行い、その後`o/master`にチェックアウトしてからもう一度コミットをします。これは、リモートブランチがどれほど違った動きをするか、そしてリモートブランチがリモートの状態を反映する時しか更新されないことを理解するのに役立つでしょう。"]}}]},ru_RU:{childViews:[{type:"ModalAlert",options:{markdowns:["## Удалённые ветки в Git","","Теперь, когда вы уже увидели `git clone` в действии, давайте углубимся в детали и посмотрим что же на самом деле изменилось.","","Во-первых, вы должны были заметить, что у нас в локальном репозитории появилась новая ветка с именем `o/master`. Такой тип ветки называется _удалённой_ веткой. Поскольку удалённые ветки играют важную и уникальную роль, они обладают рядом специальных свойств.","","Удалённые ветки отражают _состояние_ удалённых репозиториев (с того момента, как вы обращались к этим удалённым репозиториям в последний раз). Они позволяют вам отслеживать и видеть разницу между вашими локальными наработками и тем, что было сделано другими участниками - важный шаг, который необходимо делать, прежде чем делиться своими наработками с другими.","","Важным свойством удалённых веток является тот факт, что когда вы извлекаете их, вы отделяете (detaching) `HEAD`. Git делает это потому, что вы не можете работать непосредственно в этих ветках; сперва вам необходимо сделать наработки где-либо, а уж затем делиться ими с удалёнными репозиториями (после чего ваши удалённые ветки будут обновлены)."]}},{type:"ModalAlert",options:{markdowns:["### Что такое `o/` в названии ветки?","","Вы, наверное, догадались, что первый символ `o/` в названии ветки служит для обозначения именно удалённых веток. Да. Удалённые ветки также имеют (обязательное) правило именования - они отображаются в формате:","","* `<удалённый репозиторий>/<имя ветки>`","","Следовательно, если вы взглянете на имя ветки `o/master`, то здесь `master` - это имя ветки, а `o` - это имя удалённого репозитория.","","Большинство разработчиков именуют свои главные удалённые репозитории не как `o`, а как `origin`. Также общепринятым является именование удалённого репозитория как `origin`, когда вы клонируете репозиторий командой `git clone`.","","К сожалению, полное имя `origin` не помещается на элементах дизайна наших уроков, поэтому мы используем краткое `o` :( Просто помните, когда вы пользуетесь git в реальном проекте, ваш удалённый репозиторий скорее всего будет называться `origin`!","","Давайте посмотрим на всё это в действии."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Давайте извлечём (check out) удалённую ветку и посмотрим что произойдёт"],afterMarkdowns:["Как вы можете видеть, git отделил (detached) `HEAD` и не обновил `o/master`, когда мы добавили новый коммит. Всё потому, что `o/master` обновится тогда и только тогда, когда обновится сам удалённый репозиторий."],command:"git checkout o/master; git commit",beforeCommand:"git clone"}},{type:"ModalAlert",options:{markdowns:["Для завершения уровня выполните коммит единожды на `master`, а затем на `o/master` (предварительно переключившись на эту ветку). Это наглядно продемонстрирует поведение удалённых веток, а также покажет, как изменения влияют на состояние удалённых репозиториев."]}}]},ko:{childViews:[{type:"ModalAlert",options:{markdowns:["## Git 원격 브랜치","","이제 `git clone`을 직접 확인 해 보셨습니다. 이제 무엇이 변했는지 살펴 봅시다.","","가장 먼저 알아차릴만한 변화는 우리의 로컬 저장소에 `o/master`라고하는 새 브랜치가 생긴겁니다. 이런 종류의 브랜치는 _원격_브랜치라고 불립니다; 원격 브랜치는 특정한 목적을 제공하기 때문에 특별한 속성들이 있습니다.","","원격 브랜치는 원격 저장소의 _상태_를 반영합니다(가장 최근 원격 원격저장소와 작업을 했을때를 기준으로). 원격 브랜치는 로컬에서의 작업과 공개적으로 되고있는 작업의 차이를 이해하는데 도와줍니다 -- 다른 사람들과 작업을 공유하기전에 반드시해야할 과정이죠.","","원격 브랜치는 체크 아웃을 하게 되면 분리된 `HEAD` 모드로 가게되는 특별한 속성이 있습니다. Git은 여러분이 이 브랜치들에서 직접 작업할 수 없기 때문에 일부로 이렇게 합니다; 여러분은 다른곳에 작업을 하고 원격 저장소와 여러분의 작업을 공유해야합니다(그 이후에 원격 브랜치가 갱신됩니다)."]}},{type:"ModalAlert",options:{markdowns:["### `o/`가 뭐죠?","","여러분은 원격 브랜치들 앞에 붙는 `o/`가 뭔지 궁금할 것입니다. 음, 원격 브랜치 또한 (필수적인) 이름짓기 규약이 있습니다 -- 다음의 형식으로 나타납니다:","","* `<remote name>/<branch name>`","","이런 이유로, 만약 `o/master`라는 이름의 브랜치를 보게되면, 브랜치의 이름은 `master`이고 원격 저장소의 이름은 `o`인겁니다.","","대부분의 개발자들은 자신의 주 원격 저장소를 `o`가 아닌 `origin`이라고 짓습니다. 사실 보통 다 이렇게 쓰기 때문에 git은 저장소를 `git clone`하게 되면 원격 저장소의 이름을 `origin`이라고 자동으로 설정해놓습니다.","","부득이하게도 `origin`이라는 풀네임은 우리 UI에 안 맞아서 `o`로 간략히 표현하겠습니다 :( 진짜 git을 사용하게되면 여러분의 원격저장소가 아마 `origin`이라고 되있다는것을 알아두세요!","","머리속에 넣기엔 너무 많이 떠든것 같습니다. 직접 확인해 봅시다."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["원격 브랜치를 체크아웃하고 무엇이 일어나는지 확인해 봅시다"],afterMarkdowns:["보이는것 처럼, git은 우리를 분리된 `HEAD` 모드로 만들고 새로운 커밋을 추가해도 `o/master`를 갱신하지 않습니다. 이것은 `o/master`가 원격 저장소가 갱신될때만 갱신되기 때문입니다."],command:"git checkout o/master; git commit",beforeCommand:"git clone"}},{type:"ModalAlert",options:{markdowns:["다음 레벨로 가기 위해서는 `master`에서 한번 커밋하고 `o/master`를 체크아웃 하고 다시 한번 커밋을 하세요. 이를 통해서 원격 브랜치가 어떻게 다르게 작동하는지 알아보고, 원격 브랜치는 원격 저장소의 상태를 반영하기만 한다는것을 이해해 봅시다."]}}]},uk:{childViews:[{type:"ModalAlert",options:{markdowns:["## Віддалені гілки","","Тепер, коли ти познайомився з `git clone` в дії, розгляньмо деталі й подивімося, що дійсно змінилося.","","Перше, що ти міг помітити -- це те, що з’явився новий бранч з назвою `o/master`. Такі гілки називаються  _віддаленими_ (remote); віддалені гілки в гіт відіграють в певному сенсі унікальну роль, тому в них є деякі спеціальні властивості, непритаманні іншим гілкам.","","Віддалені гілки відображають _стан_ віддалених репозиторіїв (точніше, стан віддаленого репо на момент останньої синхронізації). Вони дозволяють  відрізняти та відслідковувати локальні зміни та зміни інших учасників, що є дуже важливим для успішної синхронізації роботи між різними репозиторіями.","","Важливою властивістю віддалених гілок є те, що коли перейти на них, ти опинишся в стані `detached HEAD`. Git робить це спеціально, так як неможливо працювати з ними напряму; ти маєш працювати в локальній гілці й по необхідності синхронізуватися з віддаленим репозиторієм (після чого віддалену гілку буде оновлено)."]}},{type:"ModalAlert",options:{markdowns:["### Що за `o/`? Або Римський салют","","Ти, можливо, здогадуєшся для чого потрібен префікс `o/` на віддалених гілках. Так, існує (примусове) правило іменування віддалених гілок  -- вони відображаються в форматі:","","* `<ім’я віддаленого репо>/<ім’я гілки>`","","Отже, якщо розглянути гілку з назвою `o/master`, то ім’я гілки -- це `master` а ім’я віддаленого репозиторію -- це `o`.","","Більшість розробників насправді називають ім’я головного віддаленого репозиторію `origin` (початок), а не `o`. Це настільки поширена практика, що гіт автоматично називає віддалений репозиторій `origin` коли ти його клонуєш.","","На жаль повністю ім’я `origin` не влазить в наш UI, натомість ми будемо використовувати коротше `o` :( Просто не забудь, коли будеш використовувати звичайний гіт, що твій віддалений репо скоріш за все називається `origin`!","","Це багато інформації, погляньмо як це працює на прикладі."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Зробімо checkout віддаленої гілки й подивімось, що буде"],afterMarkdowns:["Як бачиш, git перейшов в стан `detached HEAD` і не оновив `o/master` коли ми зробили новий коміт. Це тому, що `o/master` буде оновлено лише тоді, коли буде оновлено віддалений репозиторій."],command:"git checkout o/master; git commit",beforeCommand:"git clone"}},{type:"ModalAlert",options:{markdowns:["Щоб пройти цей рівень, зроби один коміт в `master`, а потім переключись в `o/master` і закомітся ще раз. Це наглядно продемонструє поведінку віддалених гілок, а також покаже як зміни впливають на стан віддаленого репозиторію."]}}]},vi:{childViews:[{type:"ModalAlert",options:{markdowns:["## Nhánh Git từ xa","","Giờ bạn đã thấy cách thức hoạt động của `git clone`, cùng xem xét kỹ hơn những gì đã xảy ra.","","Điều đầu tiên mà có thể bạn để ý là một nhánh mới xuất hiện trong kho chứa địa phương của ta là `o/master`. Loại nhánh này được gọi là nhánh _từ xa_ (_remote_) ; nhánh từ xa có những thuộc tính đặc biệt vì chúng phục vụ những mục đích duy nhất.","","Nhánh từ xa phản ánh _trạng thái_ (_state_) của kho chứa từ xa (kể từ lần cuối cùng bạn tương tác với kho chứa từ xa). Chúng giúp bạn hiểu về sự khác biệt giữa công tác trên kho chứa cục bộ với kho chứa từ xa -- một bước quan trọng trước khi chia sẻ công việc của bạn với người khác.","","Nhánh từ xa có một thuộc tính đặc biệt đó là khi bạn chuyển sang chúng bạn sẽ vào trạng thái tách rời `HEAD`. Git chủ tâm làm việc này vì bạn không thể công tác trực tiếp trên chúng; bạn phải công tác ở nơi khác và chia sẻ thành quả lên kho chứa từ xa (sau đó nhánh từ xa sẽ được cập nhật)."]}},{type:"ModalAlert",options:{markdowns:["###`o/` là gì vậy?","","Có thể bạn sẽ thắc mắc về ký tự `o/` ở đầu tên nhánh từ xa có ý nghĩa gì. Chà, tên nhánh từ xa cũng có (thiết yếu) quy tắc đặt tên -- chúng được hiển thị dưới dạng:","","* `<tên kho từ xa>/<tên nhánh>`","","Do đó, ở trong `o/master` thì `master` là tên nhánh còn `o` là tên kho chứa từ xa.","","Thực tế thì hầu hết các nhà phát triển đặt tên kho chứa từ xa là `origin` chứ không phải `o`. Nó trở thành thông lệ đến nỗi Git đặt tên `origin` cho kho chứa từ xa khi bạn dùng `git clone` để sao chép một kho chứa.","","Đáng tiêc là `origin` không khớp trong giao diện của chúng tôi, nên chúng tôi đành phải viết tắt là `o` :( Nhưng hãy nhớ rằng khi dùng git thật sự thì chắc hẳn tên của kho chứa từ xa sẽ là `origin`!","","Lý thuyết hơi nhiều rồi, đi vào thực hành thôi."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Hãy thử chuyển sang nhánh từ xa xem điểu gì xảy ra"],afterMarkdowns:["Như bạn thấy, git đưa ta vào trạng thái `HEAD` và không cập nhật nhánh `o/master` khi ta thêm một commit. Đó là bởi vì `o/master` chỉ cập nhật khi kho chứa từ xa được cập nhật."],command:"git checkout o/master; git commit",beforeCommand:"git clone"}},{type:"ModalAlert",options:{markdowns:["Để hoàn thành cấp độ này, commit một lần trên `master` và một lần nữa sau khi chuyển sang `o/master`. Điều nãy sẽ giúp ta hiểu cách nhánh từ xa hành xử, chúng chỉ cập nhật để phản ánh trạng thái của kho chứa từ xa."]}}]}}}},{}],145:[function(e,t,o){o.level={disabledMap:{"git branch":!0,"git checkout":!0},goalTreeString:'{"branches":{"master":{"target":"C1","id":"master","remoteTrackingBranchID":"o/master"},"o/master":{"target":"C1","id":"o/master","remoteTrackingBranchID":null},"bar":{"target":"C1","id":"bar","remoteTrackingBranchID":null}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"}},"HEAD":{"target":"master","id":"HEAD"},"originTree":{"branches":{"master":{"target":"C1","id":"master","remoteTrackingBranchID":null}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"}},"HEAD":{"target":"master","id":"HEAD"}}}',solutionCommand:"git push origin :foo;git fetch origin :bar",startTree:'{"branches":{"master":{"target":"C1","id":"master","remoteTrackingBranchID":"o/master"},"o/master":{"target":"C1","id":"o/master","remoteTrackingBranchID":null},"o/foo":{"target":"C1","id":"o/foo","remoteTrackingBranchID":null}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"}},"HEAD":{"target":"master","id":"HEAD"},"originTree":{"branches":{"master":{"target":"C1","id":"master","remoteTrackingBranchID":null},"foo":{"target":"C1","id":"foo","remoteTrackingBranchID":null}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"}},"HEAD":{"target":"master","id":"HEAD"}}}',name:{en_US:"Source of nothing",zh_CN:"没有 source 的 source",zh_TW:"沒有 source",es_AR:"Origen de nada",es_ES:"Origen de nada",pt_BR:"Origem vazia",gl:"Orixen de nada",de_DE:"Die Quelle des Nichts",ja:"無のsource",fr_FR:"Source de rien du tout",ru_RU:"Пустой источник",ko:"Source가 없다",uk:"Нема джерела",vi:"Không có nguồn"},hint:{en_US:"The branch command is disabled for this level so you'll have to use fetch!",zh_CN:"本关的 branch 命令被禁用了，你只能用 fetch！",zh_TW:"在本關卡中，不允許使用 branch 指令，因此你只能使用 fetch！",es_AR:"El comando branch está deshabilitado para este nivel, así que ¡vas a tener que usar fetch!",es_ES:"El comando branch está deshabilitado para este nivel, así que ¡vas a tener que usar fetch!",pt_BR:"O comando branch está desabilitado para este nível, então você terá de usar o fetch!",gl:"O comando branch está deshabilitado para este nivel, entón terás que empregar o comando fetch!",de_DE:"Der branch Befehl ist für diesen Level inaktiv, du musst also fetch benutzen",ja:"このレベルではbranchコマンドが無効になっているのでfetchを使うしかない！",fr_FR:"La commande branch est désactivée pour ce niveau, vous devrez donc utiliser fetch !",ru_RU:"Команда branch недоступна на этом упражнении, пользуйтесь командой fetch!",ko:"branch 명령이 비활성화 되어있습니다. fetch를 사용해야 되요!",uk:"Команда branch недоступна на цьому уроці, користуйся командою fetch!",vi:"Lệnh branch đã bị vô hiệu hóa ở cấp độ này nên bạn sẽ phải dùng fetch!"},startDialog:{en_US:{childViews:[{type:"ModalAlert",options:{markdowns:["### Oddities of `<source>`","",'Git abuses the `<source>` parameter in two weird ways. These two abuses come from the fact that you can technically specify "nothing" as a valid `source` for both git push and git fetch. The way you specify nothing is via an empty argument:',"","* `git push origin :side`","* `git fetch origin :bugFix`","","Let's see what these do..."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:['What does pushing "nothing" to a remote branch do? It deletes it!'],afterMarkdowns:['There, we successfully deleted the `foo` branch on remote by pushing the concept of "nothing" to it. That kinda makes sense...'],command:"git push origin :foo",beforeCommand:"git clone; git push origin master:foo"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:['Finally, fetching "nothing" to a place locally actually makes a new branch'],afterMarkdowns:["Very odd / bizarre, but whatever. That's git for you!"],command:"git fetch origin :bar",beforeCommand:"git clone"}},{type:"ModalAlert",options:{markdowns:["This is a quick level -- just delete one remote branch and create a new branch with `git fetch` to finish!"]}}]},fr_FR:{childViews:[{type:"ModalAlert",options:{markdowns:["### Les bizarreries de `<source>`","","Git permet de faire deux choses contre-intuitives avec le paramètre `<source>`. Ces deux astuces viennent du fait que vous pouvez techniquement ne *rien* spécifier comme `source` valide pour git push et git fetch. Autrement dit laisser vide la partie gauche de la refspec (avant le deux-points) :","","* `git push origin :side`","* `git fetch origin :bugFix`","","Voyons ce que cela fait ..."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Qu'est-ce que produit l'envoi de \"rien\" sur une branche distante ? Cela la détruit !"],afterMarkdowns:['Ici, nous avons brillamment supprimé  la branche `foo` du dépôt distant en lui envoyant le concept de "rien". Cela paraît à peu près logique...'],command:"git push origin :foo",beforeCommand:"git clone; git push origin master:foo"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:['Ensuite, un fetch de "rien" dans un emplacement local crée une nouvelle branche.'],afterMarkdowns:["Très étrange, mais peu importe. C'est git !"],command:"git fetch origin :bar",beforeCommand:"git clone"}},{type:"ModalAlert",options:{markdowns:["L'exercice pour ce niveau est simple : supprimez d'abord une branche distante puis terminez en en créant une nouvelle (locale) avec `git fetch` !"]}}]},es_AR:{childViews:[{type:"ModalAlert",options:{markdowns:["### Rarezas de `<origen>`","",'Git abusa del parámetro `<origen>` de dos extrañas maneras. Estos dos abusos vienen del hecho de que técnicamente podés especificar "la nada" como un `origen` válido tanto para git push como para git fetch. El modo de especificar la nada es a través de un parámetro vacío:',"","* `git push origin :side`","* `git fetch origin :bugFix`","","Veamos qué hacen estos..."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:['¿Qué hace el pushear "nada" a una rama remota? ¡La elimina!'],afterMarkdowns:['Ahí está, borramos la rama `foo` exitosamente del remoto pusheándole el concepto de "nada". Tiene algo de sentido...'],command:"git push origin :foo",beforeCommand:"git clone; git push origin master:foo"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:['Finalmente, fetchear "nada" a un lugar local en realidad crea una nueva rama'],afterMarkdowns:["Bastante bizarro, pero, meh, da igual. Así es git."],command:"git fetch origin :bar",beforeCommand:"git clone"}},{type:"ModalAlert",options:{markdowns:["Este es un nivel rápido: simplemente borrá una rama remota y creá una nueva usando `git fetch` para completarlo."]}}]},es_ES:{childViews:[{type:"ModalAlert",options:{markdowns:["### Rarezas de `<origen>`","",'Git abusa del parámetro `<origen>` de dos extrañas maneras. Estos dos abusos vienen del hecho de que técnicamente puedes especificar "la nada" como un `origen` válido tanto para git push como para git fetch. El modo de especificar la nada es a través de un parámetro vacío:',"","* `git push origin :side`","* `git fetch origin :bugFix`","","Veamos qué hacen estos..."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:['¿Qué hace el hacer push de "nada" a una rama remota? ¡La elimina!'],afterMarkdowns:['Ahí está, eliminamos la rama `foo` exitosamente del remoto haciendo push con "nada". Tiene algo de sentido...'],command:"git push origin :foo",beforeCommand:"git clone; git push origin master:foo"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:['Finalmente, hacer fetch de "nada" a un lugar local en realidad crea una nueva rama'],afterMarkdowns:["Bastante extraño, pero bueno, da igual. Así es git."],command:"git fetch origin :bar",beforeCommand:"git clone"}},{type:"ModalAlert",options:{markdowns:["Este es un nivel breve: simplemente elimina una rama remota y crea una nueva usando `git fetch` para completarlo."]}}]},pt_BR:{childViews:[{type:"ModalAlert",options:{markdowns:["### Coisas estranhas do `<origem>`","",'O Git abusa do parâmetro `<origem>` de duas formas estranhas. Esses dois abusos vem do fato de que tecnicamente você pode especificar "nada" como uma `origem` válida tanto para o git push como para o git fetch. A forma como você especifica "nada" é por meio de um argumento vazio:',"","* `git push origin :side`","* `git fetch origin :bugFix`","","Vejamos o que esses comandos fazem..."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:['O que fazer push de "coisa nenhuma" para um ramo remoto significa? Deletar o ramo!'],afterMarkdowns:['Aqui, excluímos com sucesso o ramo `foo` do repositório remoto por meio de um push de "coisa nenhuma" direcionado a ele. Até que faz sentido...'],command:"git push origin :foo",beforeCommand:"git clone; git push origin master:foo"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:['Finalmente, fazer um fetch de "coisa nenhuma" para uma referência local cria um novo ramo'],afterMarkdowns:["Bastante estranho / bizarro, mas de qualquer forma. É assim que o Git é!"],command:"git fetch origin :bar",beforeCommand:"git clone"}},{type:"ModalAlert",options:{markdowns:["Este é um nível rápido de resolver -- basta remover um ramo remoto com `git push` e criar um novo ramo local com `git fetch` para terminar!"]}}]},gl:{childViews:[{type:"ModalAlert",options:{markdowns:["### Rarezas do `<orixe>`","",'Git abusa do parámetro `<orixe>` de dúas maneiras extranas. Estos dous abusos veñen do feito de que técnicamente podes especificar "á nada" como un `orixe` válido tanto para git push como para git fetch. O modo de especificar a nada é a través dun parámetro vacío:',"","* `git push origin :side`","* `git fetch origin :bugFix`","","Vexamos qué fan..."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:['¿Qué fai cando se empurra a "nada" a unha rama remota? ¡Eliminaa!'],afterMarkdowns:['Ahí está, borramos a rama `foo` exitosamente do remoto empurrando o concepto da "nada". Ten algo de sentido...'],command:"git push origin :foo",beforeCommand:"git clone; git push origin master:foo"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:['Finalmente, descargar a "nada" a un lugar local na realidade crea unha nova rama'],afterMarkdowns:["Bastante bizarro, pero, meh, da igual. Así é git."],command:"git fetch origin :bar",beforeCommand:"git clone"}},{type:"ModalAlert",options:{markdowns:["Este é un nivel rápido: simplemente borra unha rama remota e crea unha nova empregando `git fetch` para completalo."]}}]},zh_TW:{childViews:[{type:"ModalAlert",options:{markdowns:["###`<source>` 奇怪的地方","",'在兩個奇怪的情況下，git 不使用 `<source>` 參數，事實上，在`git push`以及`git fetch`的情況下，可以允許你"不用"指定` source`，你可以藉由把參數留空，來表示你不想指定 source：',"","* `git push origin :side`","* `git fetch origin :bugFix`","","讓我們來看看這些在做什麼..."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["當*沒有*指定 source 的時候，`push` 對於 remote branch 做了什麼？`push`把它刪除掉了！"],afterMarkdowns:['看吧，我們藉由把 source "留空"，成功用 `push` 刪除了 `foo` branch，這合理吧...'],command:"git push origin :foo",beforeCommand:"git clone; git push origin master:foo"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:['最後，對於 `fetch` 來說，source "留空" 表示我們要在 local 上建立一個新的 branch。'],afterMarkdowns:["很奇怪吧！但那正是 git 為你做的事情！"],command:"git fetch origin :bar",beforeCommand:"git clone"}},{type:"ModalAlert",options:{markdowns:["這是一個很簡單的關卡，只需要利用 `git push` 刪除一個 remote 的 branch，並且利用 `git fetch` 建立一個新的 local 的 branch！"]}}]},zh_CN:{childViews:[{type:"ModalAlert",options:{markdowns:["### 古怪的 `<source>`","","Git 有两种关于 `<source>` 的用法是比较诡异的，即你可以在 git push 或 git fetch 时不指定任何 `source`，方法就是仅保留冒号和 destination 部分，source 部分留空。","","* `git push origin :side`","* `git fetch origin :bugFix`","","我们分别来看一下这两条命令的作用……"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["如果 push 空 <source> 到远程仓库会如何呢？它会删除远程仓库中的分支！"],afterMarkdowns:["就是这样子, 我们通过给 push 传空值 source，成功删除了远程仓库中的 `foo` 分支, 这真有意思..."],command:"git push origin :foo",beforeCommand:"git clone; git push origin master:foo"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["如果 fetch 空 <source> 到本地，会在本地创建一个新分支。"],afterMarkdowns:["很神奇吧！但无论怎么说, 这就是 Git！"],command:"git fetch origin :bar",beforeCommand:"git clone"}},{type:"ModalAlert",options:{markdowns:["这个关卡很容易 —— 只要删除一个远程的分支, 再用 `git fetch` 在本地创建一个新分支就可以了！"]}}]},de_DE:{childViews:[{type:"ModalAlert",options:{markdowns:["### Die Eigentümlichkeiten von `<Quelle>`","",'Git "missbraucht" den `<Quelle>`-Parameter in zwei Fällen. Diese rühren daher, dass man technisch gesehen "nichts" als gültige `<Quelle>` sowohl für `git push` als auch für `git fetch` angeben kann. Das macht man so:',"","* `git push origin :side`","* `git fetch origin :bugFix`","","Schauen wir, was das bewirkt ..."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:['Was passiert, wenn man "nichts" auf einen entfernten Branch pusht? Er wird gelöscht!'],afterMarkdowns:['Und schon haben wir `foo` erfolgreich auf dem Remote gelöscht, weil wir "Leere" darauf geschoben haben. Ist auf seine Weise irgendwie logisch ...'],command:"git push origin :foo",beforeCommand:"git clone; git push origin master:foo"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:['Und weiter: indem man "nichts" von einem Remote in sein lokales Repository zieht, erstellt man tatsächlich einen neuen Branch.'],afterMarkdowns:["Ziemlich abgefahren / bizarr, aber was soll's. Das ist halt Git."],command:"git fetch origin :bar",beforeCommand:"git clone"}},{type:"ModalAlert",options:{markdowns:["Das ist ein kurzer Level -- lösch einfach den Remote Branch und erstelle einen neuen Branch mit `git fetch`, um ihn zu lösen."]}}]},ru_RU:{childViews:[{type:"ModalAlert",options:{markdowns:["### Странный `<источник>`","","Git использует параметр `<источник>` странным образом. Странность заключается в том, что Вы можете оставить пустым параметр `<источник>` для команд git push и git fetch:","","* `git push origin :side`","* `git fetch origin :bugFix`","","Посмотрим, что же из этого выйдет..."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Что же будет с веткой, на которую мы делаем git push с пустым аргументом `<источник>`? Она будет удалена!"],afterMarkdowns:['Как видите, мы удалили ветку `foo` в удаленном репозитории, попытавшить протолкнуть(git push) в неё "ничего".'],command:"git push origin :foo",beforeCommand:"git clone; git push origin master:foo"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:['Наконец, если мы попытаемся притянуть изменения(git fetch) из "ничего" к нам в локальный репозиторий, то это создаст у нас новую ветку'],afterMarkdowns:["Вот такой вот чудной git!"],command:"git fetch origin :bar",beforeCommand:"git clone"}},{type:"ModalAlert",options:{markdowns:["Это легкое упражнение - нужно всего лишь удалить одну ветку в удаленном репозитории и создать новую ветку в локальном, с помощью команд `git push` и `git fetch` соответственно!"]}}]},ko:{childViews:[{type:"ModalAlert",options:{markdowns:["###`<source>`의 이상함","",'Git은 `<source>` 인자를 두가지 방법으로 이상하게 사용합니다. 이 두가지 오용은 여러분이 git push와 git fetch에 `source`에 "없음"을 지정할 수 있기 때문에 나타납니다. "없음"을 지정하는 방법은 인자로 아무것도 안쓰면 됩니다:',"","* `git push origin :side`","* `git fetch origin :bugFix`","","위에 처럼 말이죠, 뭘 할 수 있는지 확인해봅시다..."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:['"없음"을 원격 브랜치로 push하면 무엇을 할까요? 원격저장소의 그 브랜치를 삭제합니다!'],afterMarkdowns:['됬습니다, 원격 저장소의 `foo`브랜치를 성공적으로 삭제했습니다. "없음"을 push한다는것이 이것을 이뤘습니다. 흠 말이 되는것 같네요 null을 push했어요...'],command:"git push origin :foo",beforeCommand:"git clone; git push origin master:foo"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:['마지막으로, "nothing"을 fetch하면 로컬에 새 브랜치를 만듭니다'],afterMarkdowns:["기괴합니다... 뭐어때요. git이 이런데요 뭐!"],command:"git fetch origin :bar",beforeCommand:"git clone"}},{type:"ModalAlert",options:{markdowns:["이번 레벨은 금방 넘어가는 레벨입니다 -- 원격저장소의 브랜치하나를 삭제하고 `git fetch`를 이요해서 새 브랜치를 만들어보세요!"]}}]},uk:{childViews:[{type:"ModalAlert",options:{markdowns:["### Неочевидні способи використання `<source>`","","Git має два хитрі способи використання `<source>`. Обидва випливають з факту, що формально (і цілком легально) ти можеш не вказувати джерело (`source`) як для git push так і для git fetch. Ось, як саме ти можеш це зробити:","","* `git push origin :side`","* `git fetch origin :bugFix`","","Погляньмо, що в результаті вийде..."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:['Що буде, якщо спробувати запушити "ніщо" у гілку віддаленого репозиторію? Git її видалить!'],afterMarkdowns:['Ось, ми успішно видалили гілку `foo` на віддаленому сервері, запушивши в неї "ніщо". Ну, ніби все правильно...'],command:"git push origin :foo",beforeCommand:"git clone; git push origin master:foo"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:['І останнє, звантаження "нічого" в локальний репозиторій створює нову гілку'],afterMarkdowns:["Дуже дивно, але такий він, git!"],command:"git fetch origin :bar",beforeCommand:"git clone"}},{type:"ModalAlert",options:{markdowns:["Це швидкий рівень -- просто видали одну віддалену гілку і створи нову локальну гілку, використовуючи `git fetch`!"]}}]},vi:{childViews:[{type:"ModalAlert",options:{markdowns:["### Sự kỳ quặc của `<nguồn>`","",'Git lợi dụng tham số `<nguồn>` theo 2 cách khá dị.Hai cách lợi dụng này bắt nguồn từ thục tế là bạn có thể "không chỉ định" `nguồn` cho cả git push và git fetch. Bạn có thể làm điều này bằng cách để trống tham số như sau:',"","* `git push origin :side`","* `git fetch origin :bugFix`","","Hãy xem thử 2 câu lệnh này làm việc gì..."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:['Nếu ta đẩy "không gì cả" lên một nhánh từ xa thì nó sẽ làm gì? Nó xóa nhánh đó!'],afterMarkdowns:['Đó, ta đã xóa thành công nhánh `foo` trên kho chứa từ xa bằng cách đẩy "không gì cả" lên nó. Khá là hợp lý...'],command:"git push origin :foo",beforeCommand:"git clone; git push origin master:foo"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:['Cuối cùng, nạp "không gì cả" vào một kho chứa cục bộ thực tế sẽ tạo ra một nhánh mới'],afterMarkdowns:["Khá là quái và dị. Nhưng mà dó là những gì git làm!"],command:"git fetch origin :bar",beforeCommand:"git clone"}},{type:"ModalAlert",options:{markdowns:["Ở cấp độ đơn giản này -- bạn chỉ cần xóa một nhánh từ xa và tạo ra một nhánh mới với `git fetch` để hoàn thành!"]}}]}}}},{}],146:[function(e,t,o){o.level={goalTreeString:"%7B%22branches%22%3A%7B%22master%22%3A%7B%22target%22%3A%22C1%22%2C%22id%22%3A%22master%22%2C%22remoteTrackingBranchID%22%3A%22o/master%22%7D%2C%22o/master%22%3A%7B%22target%22%3A%22C3%27%22%2C%22id%22%3A%22o/master%22%2C%22remoteTrackingBranchID%22%3Anull%7D%2C%22side%22%3A%7B%22target%22%3A%22C3%27%22%2C%22id%22%3A%22side%22%2C%22remoteTrackingBranchID%22%3A%22o/master%22%7D%7D%2C%22commits%22%3A%7B%22C0%22%3A%7B%22parents%22%3A%5B%5D%2C%22id%22%3A%22C0%22%2C%22rootCommit%22%3Atrue%7D%2C%22C1%22%3A%7B%22parents%22%3A%5B%22C0%22%5D%2C%22id%22%3A%22C1%22%7D%2C%22C3%22%3A%7B%22parents%22%3A%5B%22C1%22%5D%2C%22id%22%3A%22C3%22%7D%2C%22C2%22%3A%7B%22parents%22%3A%5B%22C1%22%5D%2C%22id%22%3A%22C2%22%7D%2C%22C3%27%22%3A%7B%22parents%22%3A%5B%22C2%22%5D%2C%22id%22%3A%22C3%27%22%7D%7D%2C%22HEAD%22%3A%7B%22target%22%3A%22side%22%2C%22id%22%3A%22HEAD%22%7D%2C%22originTree%22%3A%7B%22branches%22%3A%7B%22master%22%3A%7B%22target%22%3A%22C3%27%22%2C%22id%22%3A%22master%22%2C%22remoteTrackingBranchID%22%3Anull%7D%7D%2C%22commits%22%3A%7B%22C0%22%3A%7B%22parents%22%3A%5B%5D%2C%22id%22%3A%22C0%22%2C%22rootCommit%22%3Atrue%7D%2C%22C1%22%3A%7B%22parents%22%3A%5B%22C0%22%5D%2C%22id%22%3A%22C1%22%7D%2C%22C2%22%3A%7B%22parents%22%3A%5B%22C1%22%5D%2C%22id%22%3A%22C2%22%7D%2C%22C3%27%22%3A%7B%22parents%22%3A%5B%22C2%22%5D%2C%22id%22%3A%22C3%27%22%7D%7D%2C%22HEAD%22%3A%7B%22target%22%3A%22master%22%2C%22id%22%3A%22HEAD%22%7D%7D%7D",solutionCommand:"git checkout -b side o/master;git commit;git pull --rebase;git push",startTree:'{"branches":{"master":{"target":"C1","id":"master","remoteTrackingBranchID":"o/master"},"o/master":{"target":"C1","id":"o/master","remoteTrackingBranchID":null}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"}},"HEAD":{"target":"master","id":"HEAD"},"originTree":{"branches":{"master":{"target":"C2","id":"master","remoteTrackingBranchID":null}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"},"C2":{"parents":["C1"],"id":"C2"}},"HEAD":{"target":"master","id":"HEAD"}}}',name:{en_US:"Remote Tracking",zh_CN:"远程追踪",zh_TW:"remote tracking",es_AR:"Trackeando remotos",es_ES:"Trackeando remotos",pt_BR:"Seguindo remotos",gl:"Traceando os remotos",de_DE:"Remote Tracking",ja:"リモートのトラッキング",fr_FR:"Suivi de branche distante",ru_RU:"Слежка за удалённым репозиторием",ko:"원격 저장소 추적하기",uk:"Слідкуємо за віддаленим репозиторієм",vi:"Theo dõi từ xa"},hint:{en_US:"Remember there are two ways to set remote tracking!",zh_CN:"记住，有两种设置 remote tracking 的方法!",zh_TW:"記住喔，有兩個方式可以去設定 remote tracking",es_AR:"¡Acordate de que hay dos formas de trackear un remoto!",es_ES:"¡Recuerda que hay dos formas de trackear un remoto!",pt_BR:"Lembre-se que há duas formas de seguir um ramo remoto!",gl:"¡Lembrate de que hai dúas formas de seguir unha rama remota!",de_DE:"Nicht vergessen, es gibt zwei Arten Remote Tracking einzurichten!",ja:"リモートトラッキングを設定する方法が二つあるのをお忘れなく!",fr_FR:"Rappelez-vous qu'il existe deux façons de configurer le suivi de branche distante !",ru_RU:"Помни, есть два способа установить слежку за удалённым репозиторием!",ko:"원격 추적하기를 설정하는데에는 두가지 방법이 있습니다!",uk:"Пам'ятай, є два способи слідкувати за віддаленим репозиорієм!",vi:"Hãy nhớ rằng, có 2 cách để thiết lập theo dõi từ xa!"},startDialog:{en_US:{childViews:[{type:"ModalAlert",options:{markdowns:["### Remote-Tracking branches","",'One thing that might have seemed "magical" about the last few lessons is that git knew the `master` branch was related to `o/master`. Sure these branches have similar names and it might make logical sense to connect the `master` branch on the remote to the local `master` branch, but this connection is demonstrated clearly in two scenarios:',"","* During a pull operation, commits are downloaded onto `o/master` and then *merged* into the `master` branch. The implied target of the merge is determined from this connection.","* During a push operation, work from the `master` branch was pushed onto the remote's `master` branch (which was then represented by `o/master` locally). The *destination* of the push is determined from the connection between `master` and `o/master`.",""]}},{type:"ModalAlert",options:{markdowns:["## Remote tracking","",'Long story short, this connection between `master` and `o/master` is explained simply by the "remote tracking" property of branches. The `master` branch is set to track `o/master` -- this means there is an implied merge target and implied push destination for the `master` branch.',"","You may be wondering how this property got set on the `master` branch when you didn't run any commands to specify it. Well, when you clone a repository with git, this property is actually set for you automatically. ","","During a clone, git creates a remote branch for every branch on the remote (aka branches like `o/master`). It then creates a local branch that tracks the currently active branch on the remote, which is `master` in most cases.","","Once git clone is complete, you only have one local branch (so you aren't overwhelmed) but you can see all the different branches on the remote (if you happen to be very curious). It's the best of both worlds!","","This also explains why you may see the following command output when cloning:","",'    local branch "master" set to track remote branch "o/master"']}},{type:"ModalAlert",options:{markdowns:["### Can I specify this myself?","","Yes you can! You can make any arbitrary branch track `o/master`, and if you do so, that branch will have the same implied push destination and merge target as `master`. This means you can run `git push` on a branch named `totallyNotMaster` and have your work pushed to the `master` branch on the remote!","","There are two ways to set this property. The first is to checkout a new branch by using a remote branch as the specified ref. Running","","`git checkout -b totallyNotMaster o/master`","","Creates a new branch named `totallyNotMaster` and sets it to track `o/master`."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Enough talking, let's see a demonstration! We will checkout a new branch named `foo` and set it to track `master` on the remote."],afterMarkdowns:["As you can see, we used the implied merge target of `o/master` to update the `foo` branch. Note how master doesn't get updated!!"],command:"git checkout -b foo o/master; git pull",beforeCommand:"git clone; git fakeTeamwork"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["This also applies for git push"],afterMarkdowns:["Boom. We pushed our work to the `master` on the remote even though our branch was named something totally different"],command:"git checkout -b foo o/master; git commit; git push",beforeCommand:"git clone"}},{type:"ModalAlert",options:{markdowns:["### Way #2","","Another way to set remote tracking on a branch is to simply use the `git branch -u` option. Running","","`git branch -u o/master foo`","","will set the `foo` branch to track `o/master`. If `foo` is currently checked out you can even leave it off:","","`git branch -u o/master`",""]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Let's see this other way of specifying remote tracking real quick..."],afterMarkdowns:["Same as before, just a more explicit command. Sweet!"],command:"git branch -u o/master foo; git commit; git push",beforeCommand:"git clone; git checkout -b foo"}},{type:"ModalAlert",options:{markdowns:["Ok! For this level let's push work onto the `master` branch on remote while *not* checked out on `master` locally. I'll let you figure out the rest since this is the advanced course :P"]}}]},fr_FR:{childViews:[{type:"ModalAlert",options:{markdowns:["### Le suivi des branches distantes","",'Dans les dernières leçons, git savait que la branche `master` était reliée à `o/master`, et cela a pu vous paraître "magique". Il est certain que ces deux branches ont des noms similaires et il peut être logique de croire que la branche locale `master` est liée à la branche distante `master`, mais la relation n\'est prouvée que dans deux scénarios :',"","* Pendant un pull, les commits sont téléchargés dans `o/master` et ensuite *fusionnés* (merge) dans la branche `master`. La cible impliquée dans cette fusion est déterminée par cette relation.","* Pendant un push, le travail de la branche `master` a été envoyé sur la branche distante `master` (qui est localement représentée par `o/master`). La *destination* du push est déterminée par la relation entre `master` and `o/master`.",""]}},{type:"ModalAlert",options:{markdowns:["## Remote tracking","","Pour faire court, cette relation entre `master` et `o/master` est simplement portée par la propriété \"remote tracking\" (suivi distant) des branches. La branche `master` est configurée pour suivre `o/master` : cela signifie qu'il y a une cible de fusion et une destination d'envoi implicites pour la branche `master`.","","Vous vous demandez peut-être comment cette propriété a été configurée pour la branche `master` alors que vous n'avez exécuté aucune commande pour le faire. Eh bien, quand vous clonez un dépôt avec git, cette propriété est configurée automatiquement. ","","Pendant le clonage, git crée une branche distante pour chaque branche du dépôt distant (c'est à dire des branches comme `o/master`). Il crée ensuite une branche locale qui suit la branche actuellement active sur le dépôt distant, qui se trouve être `master` dans la plupart des cas.","","Une fois que git clone est terminé, vous avez seulement une branche locale (comme ça vous n'êtes pas submergé) mais vous pouvez voir toutes les branches distantes (si vous êtes très curieux). C'est le compromis idéal !","","Cela explique aussi pourquoi vous avez peut-être vu la sortie suivante pendant le clonage :","",'    local branch "master" set to track remote branch "o/master"']}},{type:"ModalAlert",options:{markdowns:["### Puis-je configurer cette relation moi-même ?","","Absolument ! Vous pouvez suivre `o/master` depuis n'importe quelle branche, et si vous le faîtes, cette branche va avoir la même destination de push et cible de merge que pour `master`. Cela signifie que vous pouvez exécuter `git push` sur une branche nommée `totallyNotMaster` mais envoyer tout de même votre travail sur la branche `master` du dépôt distant !","","Il y a deux façons de configurer cette propriété. La première est de créer une nouvelle branche en la branchant immédiatement sur la branche distante, à l'aide de `git checkout -b` :","","`git checkout -b totallyNotMaster o/master`","","Cette commande crée une nouvelle branche nommée `totallyNotMaster` et la configure pour suivre `o/master`."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Assez parlé, faisons une démonstration ! Nous allons nous placer sur une nouvelle branche nommée `foo` et la configurer pour suivre `master` du dépôt distant."],afterMarkdowns:["Comme vous pouvez le voir, nous avons utilisé la cible de fusion déclarée pour `o/master` afin de mettre à jour la branche `foo`. Remarquez que la branche master n'a pas été mise à jour !!"],command:"git checkout -b foo o/master; git pull",beforeCommand:"git clone; git fakeTeamwork"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Cela s'applique aussi pour git push :"],afterMarkdowns:["Boum. Nous avons envoyé notre travail sur `master` vers le dépôt distant alors que notre branche avait un nom totalement différent."],command:"git checkout -b foo o/master; git commit; git push",beforeCommand:"git clone"}},{type:"ModalAlert",options:{markdowns:["### Méthode n°2","","Une autre façon de configurer le suivi d'une branche est d'utiliser l'option `git branch -u`. La commande est alors :","","`git branch -u o/master foo`","","Ce qui va configurer la branche `foo` (déjà existante) pour suivre `o/master`. Si `foo` est la branche courante, vous pouvez même ne pas la préciser :","","`git branch -u o/master`",""]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Voyons cette autre manière de paramètrer le suivi d'une branche distante..."],afterMarkdowns:["C'est la même chose, et c'est juste un peu plus explicite. Cool !"],command:"git branch -u o/master foo; git commit; git push",beforeCommand:"git clone; git checkout -b foo"}},{type:"ModalAlert",options:{markdowns:["Ok ! Pour ce niveau, envoyons notre travail sur la branche distante `master` en ne se trouvant *pas* sur la branche `master` locale. Je vous laisse chercher comment faire, puisque c'est une leçon de niveau avancé :P"]}}]},es_AR:{childViews:[{type:"ModalAlert",options:{markdowns:["### Ramas que trackean remotos","",'Una de las cosas que pueden haber parecido "mágicas" de las últimas lecciones es que git sabía que la rama `master` estaba relacionada con `o/master`. Obviamente, estas ramas tienen nombres parecidos, y podría parecer lógico conectar la rama `master` del remoto con la rama `master` local, pero esta conexión es bien evidente en dos escenarios:',"","* Durante una operación de pull, los commits se descargan a `o/master` y después se *mergean* a la rama `master`. El objetivo implícito del merge se determina con esta conexión.","* Durante un push, el trabajo de la rama `master` se sube a la rama `master` del remoto (que estaba representada localmente por `o/master`). El *destino* del push se determina con esta conexión entre `master` y `o/master`.",""]}},{type:"ModalAlert",options:{markdowns:["## Trackeando remotos","",'Haciéndola corta, esta conexión entre `master` y `o/master` se explica simplemente por la propiedad de "trackear (seguir) remotos" de las ramas. La rama `master` está configurada para trackear `o/master` -- osea, que hay un objetivo implícito para el merge y un destino implícito para de la rama `master`.',"","Podrías estar pensando cómo esa propiedad apareció en tu rama `master` si vos no corriste ningún comando para especificarlo. Bueno, cuando clonás un repositorio con git, esta propiedad se asigna por vos automáticamente.","","Durante un clone, git crea una rama remota por cada rama en el remoto (por ejemplo, ramas como `o/master`). Pero después crea una rama local que trackea la rama activa del remote, que suele ser `master`.","","Una vez completado el git clone, sólo tenés una única rama local (para que no te asustes) pero podés ver todas las ramas que del remoto (si fueras tan curioso). ¡Es lo mejor de ambos mundos!","","Esto también explica por qué podrías ver un mensaje como este durante la clonación:","",'    local branch "master" set to track remote branch "o/master"',"",'    rama local "master" establecida para trackear la rama remota "o/master"']}},{type:"ModalAlert",options:{markdowns:["### ¿Puedo especificarlo yo?","","¡Claro que sí! Podés hacer que cualquier rama que quieras trackee `o/master`, y si lo hicieras, esa rama va a tener el mismo destino implícito de push y objetivo implícito de merge que `master`. Eso significa que podés correr `git push` en una rama llamada `absolutamenteNoEsMaster` y ¡que tu trabajo se pushee a la rama `master` del remoto!","","Hay dos formas de establecer esta propiedad. La primera es checkoutear una nueva rama usando una rama remota como la referencia especificada. Ejecutar","","`git checkout -b absolutamenteNoEsMaster o/master`","","Crea una nueva rama llamada `absolutamenteNoEsMaster` y la hace trackear a `o/master`."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Suficiente charla, ¡veamos una demo! Vamos a checkoutear una nueva rama llamada `foo` y hacer que trackee a `master` en el remoto."],afterMarkdowns:["Como podés ver, usamos el objetivo implícito de merge `o/master` para actualizar la rama `foo`. ¡Notá cómo `master` no fue actualizada!"],command:"git checkout -b foo o/master; git pull",beforeCommand:"git clone; git fakeTeamwork"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Lo mismo aplica para git push"],afterMarkdowns:["Boom. Pusheamos nuestro trabajo a la rama `master` del remoto incluso cuando nuestra rama se llamaba totalmente distinto"],command:"git checkout -b foo o/master; git commit; git push",beforeCommand:"git clone"}},{type:"ModalAlert",options:{markdowns:["### Forma número 2","","Otra forma de especificar la rama a trackear es usar la opción `git branch -u`. Ejecutando","","`git branch -u o/master foo`","","establecemos que la rama `foo` trackee a `o/master`. Si encima estás parado en `foo`, incluso podés obviarlo:","","`git branch -u o/master`",""]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Veamos rápidamente esta otra forma de especificar la rama a trackear..."],afterMarkdowns:["Lo mismo que antes, sólo que con un comando bastante más explícito. ¡Una belleza!"],command:"git branch -u o/master foo; git commit; git push",beforeCommand:"git clone; git checkout -b foo"}},{type:"ModalAlert",options:{markdowns:["¡Ok! Para este nivel, pusheá tu trabajo a la rama `master` del remoto *sin* estar parado sobre `master` localmente. Te dejo que te des cuenta del resto solo, que para algo este es el curso avanzado :P"]}}]},es_ES:{childViews:[{type:"ModalAlert",options:{markdowns:["### Ramas que trackean remotos","",'Una de las cosas que te pueden haber parecido "mágicas" de las últimas lecciones es que git sabía que la rama `master` estaba relacionada con `o/master`. Obviamente, estas ramas tienen nombres parecidos, y podría parecer lógico conectar la rama `master` del remoto con la rama `master` local, pero esta conexión es bien evidente en dos escenarios:',"","* Durante una operación de pull, los commits se descargan a `o/master` y después se *mergean* a la rama `master`. El objetivo implícito del merge se determina con esta conexión.","* Durante un push, el trabajo de la rama `master` se sube a la rama `master` del remoto (que estaba representada localmente por `o/master`). El *destino* del push se determina con esta conexión entre `master` y `o/master`.",""]}},{type:"ModalAlert",options:{markdowns:["## Trackeando remotos","",'Resumiendo, esta conexión entre `master` y `o/master` se explica simplemente por la propiedad de "trackear (seguir) remotos" de las ramas. La rama `master` está configurada para trackear `o/master` -- osea, que hay un objetivo implícito para el merge y un destino implícito para de la rama `master`.',"","Podrías estar pensando cómo esa propiedad apareció en tu rama `master` si no ejecutaste ningún comando para especificarlo. Bueno, cuando clonas un repositorio con git, esta propiedad es asignada por ti automáticamente.","","Durante un clone, git crea una rama remota por cada rama en el remoto (por ejemplo, ramas como `o/master`). Pero después crea una rama local que trackea la rama activa del remote, que suele ser `master`.","","Una vez completado el git clone, sólo tienes una única rama local (para que no te asustes) pero puedes ver todas las ramas del remoto (si fueses curioso). ¡Es lo mejor de ambos mundos!","","Esto también explica por qué podrías ver un mensaje como este durante la clonación:","",'    local branch "master" set to track remote branch "o/master"',"",'    rama local "master" establecida para trackear la rama remota "o/master"']}},{type:"ModalAlert",options:{markdowns:["### ¿Puedo especificarlo yo?","","¡Claro que sí! Puedes hacer que cualquier rama que quieras trackee `o/master`, y si lo hicieras, esa rama va a tener el mismo destino implícito de push y objetivo implícito de merge que `master`. Eso significa que puedes ejecutar `git push` en una rama llamada `absolutamenteNoEsMaster` y ¡que tu trabajo se pushee a la rama `master` del remoto!","","Hay dos formas de establecer esta propiedad. La primera es hacer checkout sobre una nueva rama usando una rama remota como la referencia especificada. Ejecutar","","`git checkout -b absolutamenteNoEsMaster o/master`","","Crea una nueva rama llamada `absolutamenteNoEsMaster` y la hace trackear a `o/master`."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Basta de charla, ¡veamos un ejemplo! Vamos a hacer checkout de una nueva rama llamada `foo` y hacer que trackee a `master` en el remoto."],afterMarkdowns:["Como puedes ver, usamos el objetivo implícito de merge `o/master` para actualizar la rama `foo`. ¡Observa cómo `master` no fue actualizada!"],command:"git checkout -b foo o/master; git pull",beforeCommand:"git clone; git fakeTeamwork"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Lo mismo aplica para git push"],afterMarkdowns:["Zas. Hacemos push de nuestro trabajo a la rama `master` del remoto incluso cuando nuestra rama se llamaba totalmente distinto"],command:"git checkout -b foo o/master; git commit; git push",beforeCommand:"git clone"}},{type:"ModalAlert",options:{markdowns:["### Forma número 2","","Otra forma de especificar la rama a trackear es usar la opción `git branch -u`. Ejecutando","","`git branch -u o/master foo`","","establecemos que la rama `foo` trackee a `o/master`. Si encima estás parado en `foo`, incluso puedes obviarlo:","","`git branch -u o/master`",""]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Veamos rápidamente esta otra forma de especificar la rama a trackear..."],afterMarkdowns:["Lo mismo que antes, sólo que con un comando bastante más explícito. ¡Muy útil!"],command:"git branch -u o/master foo; git commit; git push",beforeCommand:"git clone; git checkout -b foo"}},{type:"ModalAlert",options:{markdowns:["¡Perfecto! Para este nivel, haz push de tu trabajo a la rama `master` del remoto *sin* estar parado sobre `master` localmente. Te dejo que te des cuenta del resto solo, que para algo este es el curso avanzado :P"]}}]},pt_BR:{childViews:[{type:"ModalAlert",options:{markdowns:["### Seguindo ramos remotos","",'Uma coisa que pode ter parecido "mágica" nas lições passadas é que o Git sabia que o ramo `master` estava relacionado com o `o/master`. Certamente esses ramos possuem nomes similares, e tem todo sentido lógico conectar o ramo `master` do lado remoto com o ramo `master` local, mas essa conexão é demonstrada claramente em dois cenários:',"","* Durante uma operação de pull, os commits são baixados em `o/master` e então são *mergidos* no ramo `master`. O alvo do merge é determinado a partir dessa conexão.","* Durante uma operação de push, o trabalho do ramo `master` local é enviado para o ramo `master` remoto (que é representado localmente por `o/master`). O *destino* do push é determinado da conexão entre `master` e `o/master`.",""]}},{type:"ModalAlert",options:{markdowns:["## Remote tracking","",'Resumindo a história, essa conexão entre `master` e `o/master` é explicada pela propriedade de "remote tracking" dos ramos. O ramo `master` é configurado para seguir o ramo `o/master` -- isso significa que existe um alvo implícito de merge e um destino implícito de push para o ramo `master`.',"","Você pode estar se perguntando como essa propriedade foi configurada no ramo `master` se você não executou nenhum comando ordenando que isso fosse feito. Bem, quando você clona um repositório com o Git, essa propriedade é configurada para você automaticamente. ","","Durante a clonagem, o Git cria um ramo remoto para cada ramo que existe no repositório remoto (ou seja, ramos como o `o/master`). Ele cria então um ramo local que segue o ramo atualmente ativo no repositório remoto, que geralmente é o `master`.","","Uma vez que a clonagem esteja completa, você terá apenas um único ramo local (para que você não seja sobrecarregado), mas você pode ver todos os ramos diferentes que existem no repositório remoto (caso você esteja curioso). É o melhor dos dois mundos!","","Isso também explica porque você vê a seguinte mensagem quando clona um repositório:","",'    local branch "master" set to track remote branch "o/master"']}},{type:"ModalAlert",options:{markdowns:["### Posso eu mesmo especificar isso?","","Sim, você pode! Você pode fazer com que qualquer ramo arbitrário siga o `o/master`, e se você fizer isso, esse ramo terá o mesmo destino de push implícito que e o mesmo alvo de merge que o `master`. Isso significa que você pode executar `git push` em um ramo chamado `realmenteNaoSouOMaster` e ainda assim ter seu trabalho enviado ao ramo `master` do repositório remoto!","","Há duas formas de configurar essa propriedade. A primeira consiste em fazer checkout de um novo ramo usando o ramo remoto como especificação de referência. Executar","","`git checkout -b realmenteNaoSouOMaster o/master`","","Cria um novo ramo chamado `realmenteNaoSouOMaster` e o configura para seguir o `o/master`."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Já foi conversa o suficiente, vamos ver uma demonstração! Vamos fazer checkout de um novo ramo chamado `foo` e configurá-lo para seguir o `master` do repositório remoto."],afterMarkdowns:["Como você pode ver, usamos o alvo implícito de merge do `o/master` para atualizar o ramo `foo`. Veja como o master local não sofreu atualização!!"],command:"git checkout -b foo o/master; git pull",beforeCommand:"git clone; git fakeTeamwork"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Isso também se aplica ao git push"],afterMarkdowns:["Boom. Nós enviamos nosso trabalho para o ramo remoto `master` ainda que nosso ramo local tivesse um nome completamente diferente"],command:"git checkout -b foo o/master; git commit; git push",beforeCommand:"git clone"}},{type:"ModalAlert",options:{markdowns:["### Forma #2","","Outra maneira de configurar remote tracking em um ramo é utilizando `git branch -u`. Executando","","`git branch -u o/master foo`","","configuraremos o ramo local `foo` para seguir o `o/master`. Se `foo` for o que estiver atualmente em checkout, você pode inclusive omiti-lo:","","`git branch -u o/master`",""]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Vejamos outra forma realmente rápida de configurar remote tracking..."],afterMarkdowns:["O mesmo de antes, apenas um comando mais explícito. Doce!"],command:"git branch -u o/master foo; git commit; git push",beforeCommand:"git clone; git checkout -b foo"}},{type:"ModalAlert",options:{markdowns:["Ok! Para este nível, vamos fazer push no ramo remoto `master` *sem estar* em um checkout do `master` local. Vou deixar você descobrir o resto, já que isto é um curso avançado :P"]}}]},gl:{childViews:[{type:"ModalAlert",options:{markdowns:["### Ramas que trackean os remotos","",'Unha das cousas que poden semellar "máxicas" das últimas leccións é que git sabía que a rama `master` estaba relacionada co `o/master`. Obviamente, estas ramas teñen nomes semellantes, e podería semellar lóxico conectar a rama `master` do remoto ca rama `master` local, pero esta conexión é ben evidente nos dous escenarios:',"","* Durante unha operación de pull, os commits descarganse ó `o/master` e logo *mesturanse* á rama `master`. O obxectivo implícito do merge determinase con esta conexión.","* Durante un push, o traballo da rama `master` súbese á rama `master` do remoto (que estaba representada localmente por `o/master`). O *destino* do push determinouse con esta conexión entre `master` e `o/master`.",""]}},{type:"ModalAlert",options:{markdowns:["## Trackeando remotos","",'Facéndoa curta, esta conexión entre `master` e `o/master` ensínase pola propiedade de "trackear (seguir) remotos" das ramas. A rama `master` está configurada para trackear `o/master` -- o que quere dicir, que hai un obxectivo implícito para o merge e un destino implícito para a rama  `master`.',"","Poderías estar pensando cómo esa propiedade apareceu na túa rama `master` se ti non executaches ningún comando para especificalo. Bueno, cando clonas un repositorio co git, esta propiedade asignase por ti automáticamente.","","Durante un clone, git crea unha rama remota por cada rama no remoto (por exemplo, ramas como `o/master`). Pero despois crea unha rama local que trakea a rama activa do remoto, que habitúa ser `master`.","","Una vez completado o git clone, só tés unha única rama local (para que non te asustes) pero podes ver todalas ramas que do remoto (se fora tan curioso). ¡É o mellor de ámbolos dous mundos!","","Esto tamén explica por qué poderías ver unha mensaxe como este durante a clonación:","",'    local branch "master" set to track remote branch "o/master"',"",'    rama local "master" establecida para trackear a rama remota "o/master"']}},{type:"ModalAlert",options:{markdowns:["### ¿Podo especificalo eu?","","¡Claro que sí! Podes facer que calquera rama que quixeras seguir `o/master`, e se o fixeras, esa rama vai ter o mesmo destino implícito de push e  obxectivo implícito de merge que `master`. Eso significa que podes executar `git push` nunha rama chamada `nonMaster` e ¡que o teu traballo se empurre á rama `master` do remoto!","","Hai dúas formas de establecer esta propiedade. A primeira é facer checkout a unha nova rama empregando unha rama remota como a referencia especificada. Executar","","`git checkout -b nonMaster o/master`","","Crea unha nova rama chamada `nonMaster` e persigue a `o/master`."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Suficiente charla, ¡vexamos unha demo! Imos facer checkout a unha nova rama chamada `foo` e facer que siga a `master` no remoto."],afterMarkdowns:["Como podes ver, empregamos o obxectivo implícito de merge `o/master` para actualizar a rama `foo`. ¡Nota como `master` non foi actualizada!"],command:"git checkout -b foo o/master; git pull",beforeCommand:"git clone; git fakeTeamwork"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["O mismo aplica para git push"],afterMarkdowns:["Boom. Empurramos o noso traballo á rama `master` do remoto incluso cando a nosa rama se chamaba totalmete distinto"],command:"git checkout -b foo o/master; git commit; git push",beforeCommand:"git clone"}},{type:"ModalAlert",options:{markdowns:["### Forma número 2","","Outra forma de especificar a rama a seguir é usar a opción `git branch -u`. Executando","","`git branch -u o/master foo`","","establecemos que a rama `foo` segue a `o/mater`. Se por riba estás parado en `foo`, incluso podes obvialo:","","`git branch -u o/master`",""]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Vexamos rápidamente está outra forma de especificar a rama a seguir..."],afterMarkdowns:["O mesmo que antes, só que un comando bastante máis explícito. ¡Unha cousa preciosa!"],command:"git branch -u o/master foo; git commit; git push",beforeCommand:"git clone; git checkout -b foo"}},{type:"ModalAlert",options:{markdowns:["¡Ok! Para este nivel, empurra o teu traballo á rama `master` do remoto *sen* estar parado sobre `master` localmente. Déixote que te decates do resto ti só, que para algo estás nun nivel avanzado :P"]}}]},zh_TW:{childViews:[{type:"ModalAlert",options:{markdowns:["### remote tracking branch","",'在之前的課程中，有一件事情看起來很"神奇"，那就是 git 知道 `master` branch 是對應到 `o/master` branch。當然這些 branch 有類似的名稱，所以可以大概猜到， local 的 `master` branch 可以對應到 remote 的 `master branch`，但是我們是在兩種情況下可以確定有這個對應關係：',"","* 在使用 `pull` 的時候，下載 commit 到 `o/master`，並且 `merge` 這些 commit 到 `master` branch，這就表示這個 merge 的目標是決定於這個對應關係。","* 在使用 `push` 的時候，在 `master` branch 上面的 commit 被 push 到 remote 上面的 `master` branch （它在 local 被表示成 `o/master`），這就表示 push 的目標是決定於 `master` 以及 `o/master` 之間的對應關係。",""]}},{type:"ModalAlert",options:{markdowns:["## Remote tracking","",'長話短說，我們可以用 branch 上面的 "remote tracking" 特性來表示介於 `master` 以及 `o/master` 的對應關係，`master` branch 被設定用來追蹤（track） `o/master`，這就表示對於 `master` branch 來說的話，有一個 merge 的目標以及 push 的目標。',"","你可能會覺得很奇怪，當你沒有下任何指令去設定的時候，關於 `master` branch 的對應關係是如何被設定的。喔！其實當你 clone 一個 repo 的時候，其實就已經自動幫你做設定了。 ","","在做 clone 的時候，git 會針對每一個在 remote 上面的 branch 建立一個 branch （例如 `o/master`），之後它會建立一個 local branch 來追蹤目前在 remote 上面的 active branch，在大部份的情況下，幾乎都是設定 `master` branch。","","一旦 git 完成這個動作，你就只會有一個 local branch ，但是你可以看到所有在 remote 上面的不同的 branch，對於 local 和 remote 來說的話，這樣子是最好的！","","這也解釋了為什麼當你 clone 的時候可能會看到以下被輸出的指令：","",'    local branch "master" set to track remote branch "o/master"']}},{type:"ModalAlert",options:{markdowns:["### 我可以自己設定嗎？","","是的你可以！你可以設定任何的 branch 來 track `o/master`， 假如你真的這麼做的話，那麼該 branch 的 push 及 merge 的目標就會跟 `master` 一樣。這就表示說你可以在 `totallyNotMaster` branch 上面執行 `git push`，並且 push 你的 commit 到 remote 的 `master` branch！","","有兩個方式可以設定，第一個就是藉由參考一個 remote branch 來 checkout 一個新的 branch。執行","","`git checkout -b totallyNotMaster o/master`","","建立一個新的 `totallyNotMaster` branch 並且它會 track `o/master`。"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["說的好多，我們現在來看一個例子！我們會 checkout 一個新的 `foo` branch，而且該 branch 會被用來 track remote 上的 `master` branch。"],afterMarkdowns:["就像你看到的，當 `o/master` 更新的時候，`foo` branch 也跟著一起被更新，要注意 master 並沒有被更新！"],command:"git checkout -b foo o/master; git pull",beforeCommand:"git clone; git fakeTeamwork"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["同樣適用於 `git push`"],afterMarkdowns:["哇，即使我們的 branch 名稱完全一點關係都沒有，但我們還是 push 了 commit 到 remote 的 `master` branch 上面。"],command:"git checkout -b foo o/master; git commit; git push",beforeCommand:"git clone"}},{type:"ModalAlert",options:{markdowns:["### 方法 #2","","另外一個設定 remote tracking 的方法是使用 `git branch -u` 這一個指令，執行","","`git branch -u o/master foo`","","你就會看到 `foo` branch 被設定成 track `o/master`，如果你現在已經 checkout 到 foo 這個 branch 上面了，你就可以省略掉它：","","`git branch -u o/master`",""]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["我們來看這個快速設定 remote tracking 的方法..."],afterMarkdowns:["跟之前一樣，就只是一個更加明確的指令，讚啦！"],command:"git branch -u o/master foo; git commit; git push",beforeCommand:"git clone; git checkout -b foo"}},{type:"ModalAlert",options:{markdowns:["好！在這個關卡中，我們要 push 我們的 commit 到 remote 上面的 `master` branch，但是我們*不* checkout 到 local 的 `master` branch。因為這是一個進階的課程，所以我會讓你明白其它的東西。:P"]}}]},zh_CN:{childViews:[{type:"ModalAlert",options:{markdowns:["### 远程跟踪分支","","在前几节课程中有件事儿挺神奇的，Git 好像知道 `master` 与 `o/master` 是相关的。当然这些分支的名字是相似的，可能会让你觉得是依此将远程分支 master 和本地的 master 分支进行了关联。这种关联在以下两种情况下可以清楚地得到展示：","","* pull 操作时, 提交记录会被先下载到 o/master 上，之后再合并到本地的 master 分支。隐含的合并目标由这个关联确定的。","* push 操作时, 我们把工作从 `master` 推到远程仓库中的 `master` 分支(同时会更新远程分支 `o/master`) 。这个推送的目的地也是由这种关联确定的！",""]}},{type:"ModalAlert",options:{markdowns:["## 远程跟踪","","直接了当地讲，`master` 和 `o/master` 的关联关系就是由分支的“remote tracking”属性决定的。`master` 被设定为跟踪 `o/master` —— 这意味着为 `master` 分支指定了推送的目的地以及拉取后合并的目标。","","你可能想知道 `master` 分支上这个属性是怎么被设定的，你并没有用任何命令指定过这个属性呀！好吧, 当你克隆仓库的时候, Git 就自动帮你把这个属性设置好了。","","当你克隆时, Git 会为远程仓库中的每个分支在本地仓库中创建一个远程分支（比如 `o/master`）。然后再创建一个跟踪远程仓库中活动分支的本地分支，默认情况下这个本地分支会被命名为 `master`。","","克隆完成后，你会得到一个本地分支（如果没有这个本地分支的话，你的目录就是“空白”的），但是可以查看远程仓库中所有的分支（如果你好奇心很强的话）。这样做对于本地仓库和远程仓库来说，都是最佳选择。","","这也解释了为什么会在克隆的时候会看到下面的输出：","",'    local branch "master" set to track remote branch "o/master"',""]}},{type:"ModalAlert",options:{markdowns:["### 我能自己指定这个属性吗？","","当然可以啦！你可以让任意分支跟踪 `o/master`, 然后该分支会像 `master` 分支一样得到隐含的 push 目的地以及 merge 的目标。 这意味着你可以在分支 `totallyNotMaster` 上执行 `git push`，将工作推送到远程仓库的 `master` 分支上。","","有两种方法设置这个属性，第一种就是通过远程分支检出一个新的分支，执行: ","","`git checkout -b totallyNotMaster o/master`","","就可以创建一个名为 `totallyNotMaster` 的分支，它跟踪远程分支 `o/master`。"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["闲话少说，咱们先看看演示！我们检出一个名叫 `foo` 的新分支，让其跟踪远程仓库中的 `master`"],afterMarkdowns:["正如你所看到的, 我们使用了隐含的目标 `o/master` 来更新 `foo` 分支。需要注意的是 master 并未被更新！"],command:"git checkout -b foo o/master; git pull",beforeCommand:"git clone; git fakeTeamwork"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["git push 同样适用"],afterMarkdowns:["我们将一个并不叫 `master` 的分支上的工作推送到了远程仓库中的 `master` 分支上"],command:"git checkout -b foo o/master; git commit; git push",beforeCommand:"git clone"}},{type:"ModalAlert",options:{markdowns:["### 第二种方法","","另一种设置远程追踪分支的方法就是使用：`git branch -u` 命令，执行：","","`git branch -u o/master foo`","","这样 `foo` 就会跟踪 `o/master` 了。如果当前就在 foo 分支上, 还可以省略 foo：","","`git branch -u o/master`",""]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["看看这种方式的实际的效果..."],afterMarkdowns:["跟之前一样, 但这个命令更明确！"],command:"git branch -u o/master foo; git commit; git push",beforeCommand:"git clone; git checkout -b foo"}},{type:"ModalAlert",options:{markdowns:["OK! 本节我们在**不**检出 `master` 分支的情况下将工作推送到的远程仓库中的 `master` 分支上。因为这是高级课程, 就不做过多的提示了! :P"]}}]},de_DE:{childViews:[{type:"ModalAlert",options:{markdowns:["### Remote Tracking Branches","",'In den letzten paar Leveln wirkte es womöglich etwas "magisch", dass Git automatisch wusste, dass der Branch `master` irgendwie mit `o/master` verwandt ist. Klar, sie haben ähnliche Namen und daher mag es logisch erscheinen sie in Verbindung zu bringen, aber offensichtlich wird es in zwei Szenarien:',"","* Beim `pull` werden Commits in `o/master` heruntergeladen und dann per *Merge* in den Branch `master` gebracht. Aus der Verbindung zwischen den beiden Branches leitet sich das Ziel des Merges ab.","* Beim `push` werden Commits vom `master` auf den `master` auf dem Remote Server geschoben (und die Änderung _danach_ in `o/master` abgebildet). Das *Ziel* des Push wird aus der Verbindung zwischen `master` und `o/master` abgeleitet.",""]}},{type:"ModalAlert",options:{markdowns:['Langer Rede kurzer Sinn, die Verbindung zwischen `master` und `o/master` ist einfach die Eigenschaft des "Remote Tracking" dieser Branches. `master` ist so eingestellt, dass er `o/master` trackt -- das heißt es gibt ein implizites Ziel für `pull` und `push` Operationen auf dem `master` Branch.',"","Du fragst dich vielleicht wieso diese Eigenschaft auf dem `master` definiert ist, wenn du das doch gar nicht explizit gemacht hast. Naja, beim Clonen eines Repository macht Git das für den `master` automatisch.","","Während des Clonens erstellt Git einen Remote Branch für jeden Branch, den es auf dem Remote Server findet (also Branches wie `o/master`); dann erstellt es für den Branch, auf den auf dem entfernten Server `HEAD` zeigt (meistens `master`) automatisch einen lokalen Branch und stellt ihn so ein, dass er sein Gegenstück auf dem Server trackt. Deswegen hast du beim clonen vielleicht schon mal dies gesehen:","",'    local branch "master" set to track remote branch "o/master"']}},{type:"ModalAlert",options:{markdowns:["### Kann ich das auch selbst machen?","","Na klar! Du kannst jeden beliebigen Branch so einstellen, dass er `o/master` trackt, und wenn du das tust wird der Branch dieselben impliziten Zielangaben für `push` und `pull` haben wie `master`. Du kannst also `git push` auf dem Branch `absolut_nicht_master` ausführen und deine Commits auf `master` auf dem entfernten Server schieben lassen.","","Es gibt zwei Möglichkeiten diese Eigenschaft zu definieren. Die erste ist, einen neuen lokalen Branch von einem Remote Branch auszuchecken. Wenn man","","    git checkout -b absolut_nicht_master o/master","","eingibt, wird ein neuer lokaler Branch namens `absolut_nicht_master` angelegt, der `o/master` trackt."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Genug gequatscht, schauen wir uns eine Demonstration an! Wir checken einen neuen Branch `foo` aus, so dass er `master` auf dem Server trackt."],afterMarkdowns:["Wie du siehst benutzen wir der implizite Ziel beim `pull` um `foo` zu aktualisieren. Beachte, dass `master` nicht aktualisiert wird."],command:"git checkout -b foo o/master; git pull",beforeCommand:"git clone; git fakeTeamwork"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Das gilt auch für `git push`."],afterMarkdowns:["Bämm. Wir haben unsere Commits auf den `master` auf dem Server geschoben, obwohl unser lokaler Branch völlig anders heißt."],command:"git checkout -b foo o/master; git commit; git push",beforeCommand:"git clone"}},{type:"ModalAlert",options:{markdowns:["### Methode 2","","Noch eine Möglichkeit um Remote Tracking auf einem Branch einzustellen, ist einfach `git branch -u` zu benutzen. Wenn man","","    git branch -u o/master foo","","eingibt, wir damit der lokale Branch `foo` so eingestellt, dass er `o/master` trackt. Den Namen des lokalen Branch kannst du auch weglassen, falls du ihn eh aktuell ausgecheckt hast:","","    git branch -u o/master",""]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Schauen wir uns auch diese Methode noch an ..."],afterMarkdowns:["Genau wie vorher, nur ein bisschen ausführlicherer Befehl. Schick!"],command:"git branch -u o/master foo; git commit; git push",beforeCommand:"git clone; git checkout -b foo"}},{type:"ModalAlert",options:{markdowns:["Ok. In diesem Level muss du Commits auf den `master` auf dem Server schieben, *ohne* den lokalen `master` ausgecheckt zu haben. Den Rest kannst du selbst herausfinden, schließlich ist das hier für Fortgeschrittene. :P"]}}]},ru_RU:{childViews:[{type:"ModalAlert",options:{markdowns:["### Удалённые-отслеживаемые ветки","",'Единственное, что могло бы показаться вам "магией" в нескольких предыдущих уроках - это то, как git знает, что ветка `master` соответствует `o/master`. Конечно, эти ветки имеют схожие имена и связь между локальной и удалённой ветками `master` выглядит вполне логично, однако, эта связь наглядно продемонстрирована в двух сценариях:',"","* Во время операции pull коммиты скачиваются в ветку `o/master` и затем *соединяются* в ветку `master`. Подразумеваемая цель слияния определяется исходя из этой связи.","* Во время операции push наработки из ветки `master` закачиваются на удалённую ветку `master` (которая в локальном представлении выглядит как `o/master`). *Пункт назначения* операции push определяется исходя из связи между `master` и `o/master`.",""]}},{type:"ModalAlert",options:{markdowns:["## Удалённые-отслеживаемые ветки","",'Короче, связь между `master` и `o/master` объясняется не иначе как свойство "удалённое отслеживание" веток. Ветка `master` настроена так, чтобы следить за `o/master` -- это подразумевает наличие источника для merge и пункта назначения для push в контексте ветки `master`.',"","Вы, должно быть, удивлены, как это отслеживание появилось на ветке `master`, если мы не запускали ни одной специфической команды. На самом деле, когда вы клонируете репозиторий, это слежение включается автоматически.","","В процессе клонирования git локально создаёт удалённые ветки для каждой ветки с удалённого репозитория (такие как `o/master`). Затем он - git - создаёт локальные ветки, которые отслеживают текущую, активную ветку на удалённом репозитории. В большинстве случаев - это `master`.","","К тому моменту как `git clone` завершит своё выполнение, у вас будет лишь одна локальная ветка (так что вы ещё не сильно перегружены), но, если вам будет интересно, вы сможете увидеть все удалённые ветки (при желании).","","Именно это объясняет, почему сразу после клонирования вы видите в консоли надпись:","",'    local branch "master" set to track remote branch "o/master"',"",'    (локальная ветка "master" теперь следит за удалённой веткой "o/master") ']}},{type:"ModalAlert",options:{markdowns:["### А могу ли я сделать это самостоятельно?","","Само собой! Вы можете сказать любой из веток, чтобы она отслеживала `o/master`, и если вы так сделаете, эта ветка будет иметь такой же пункт назначения для push и merge как и локальная ветка `master`. Это значит, что вы можете выполнить `git push`, находясь на ветке `totallyNotMaster`, и все ваши наработки с ветки `totallyNotMaster` будут закачены на ветку `master` удалённого репозитория!","","Есть два способа сделать это. Первый - это выполнить checkout для новой ветки, указав удалённую ветку в качестве ссылки. Для этого необходимо выполнить команду","","`git checkout -b totallyNotMaster o/master`","",", которая создаст новую ветку с именем `totallyNotMaster` и укажет ей следить за `o/master`."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Хватит болтовни, давайте взглянем на демонстрацию! Мы выполним checkout для новой ветки `foo` и укажем ей, чтобы она отслеживала `master` с удалённого репозитория."],afterMarkdowns:["Как вы увидели, мы использовали `o/master`, чтобы обновить ветку `foo`. Обратите внимание, как обновился `master`!!"],command:"git checkout -b foo o/master; git pull",beforeCommand:"git clone; git fakeTeamwork"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Это работает также и для git push"],afterMarkdowns:["Оп! Мы закачали наши наработки на ветку `master` нашего удалённого репозитория. При том, что наша локальная ветка называется абсолютно по-другому."],command:"git checkout -b foo o/master; git commit; git push",beforeCommand:"git clone"}},{type:"ModalAlert",options:{markdowns:["### Способ №2","","Другой способ указать ветке отслеживать удалённую ветку — это просто использовать команду `git branch -u`. Выполнив команду","","`git branch -u o/master foo`","","вы укажете ветке `foo` следить за `o/master`. А если вы ещё при этом находитесь на ветке `foo`, то её можно не указывать:","","`git branch -u o/master`",""]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Как видно, второй способ указать слежение за веткой намного быстрее..."],afterMarkdowns:["Словом, всё как и раньше, просто отдельная, специальная команда. Здорово!"],command:"git branch -u o/master foo; git commit; git push",beforeCommand:"git clone; git checkout -b foo"}},{type:"ModalAlert",options:{markdowns:["Отлично! Для выполнения этого уровня давайте выполним push наших наработок в ветку `master` на удалённом репозитории, при этом *не* скачивая и не создавая ветку `master` локально. Я объясню вам оставшееся чуть позже, т.к. это продвинутый курс :P"]}}]},ja:{childViews:[{type:"ModalAlert",options:{markdowns:["### リモートトラッキングブランチ","","もしかしたら直近の幾つかの章で、あることが「魔法」に見えたかもしれません。それは、gitが`master`ブランチは`o/master`に関連していることを知っていたということです。確かにこれらのブランチは似た名前を持っていて、それは、リモートの`master`ブランチとローカルの`master`ブランチを繋ぐ論理的な意味を成すかもしれません。しかし、リモートトラッキングの関係が、次のような2つの手順を明確にしています:","","* プルの実行時は、コミットを`o/master`上にダウンロードし、`master`ブランチにそれを*マージ*します。マージの暗黙のターゲットは、リモートトラッキングの関係によって決められます。","* プッシュの実行時は、`master`ブランチの作業はリモートの`master`ブランチ（ローカルでは`o/master`によって表現されています）にプッシュされます。プッシュ動作の決定は、`master`と`o/master`のリモートトラッキングな関係から決定されます。",""]}},{type:"ModalAlert",options:{markdowns:["## リモートトラッキング","",'かいつまんでは、`master`と`o/master`の関係は、単にそれぞれのブランチの"remote traking"というプロパティによって説召されます。`master`ブランチには`o/master`を追跡しているというように設定されているのです。これは、`master`ブランチのための暗黙のプッシュ先と暗黙の取り込み先が存在することを意味します。',"","あなたは特に何も指定せずにコマンドを走らせていたのに、`master`ブランチにこのプロパティが設定されていたことに疑問を持つかもしれません。そう、gitによってリポジトリを複製した時、gitは実はこのプロパティを自動的に設定してくれるのです。","","クローンしている間、gitはリモートブランチをリモートのブランチ全てに対して作ります（例えば、`o/master`のような感じです）。その後、現在アクティブなブランチを追跡するローカルブランチを作成します。多くの場合それは`master`ブランチになります。","","gitのクローンが完了した時、あなたの手にはたった一つだけローカルブランチがあります（なので、閉口しないでも大丈夫です）。しかし、あなたは全てのリモートのブランチ同士の違いを見ることができるのです（もし、あなたがそれについて非常に好奇心旺盛であるときはいつでもね！）。これは、両方の世界にとってベストです！","","これはクローン中に次のようなコマンド出力が表示されることも説明します:","",'    local branch "master" set to track remote branch "o/master"']}},{type:"ModalAlert",options:{markdowns:["### 私は自分でトラッキングを設定できますか？","","はい、できます！あなたは、全てのブランチについて`o/master`との追跡を設定でき、もしそうした時は、同じ暗黙のプッシュ先と取り込み先を`master`として設定します。これは、例えば`tottallyNotMaster`という名前のブランチで`git push`を走らせ、作業をリモートの`master`ブランチにプッシュするといったことができるということを意味しています！","","このプロパティを設定するには2つの方法があります。一つ目は、リモートブランチのリファレンスを使用して新しいブランチをチェックアウトするというものです。例えば次のコマンドを走らせてます","","`git checkout -b totallyNotMaster o/master`","","これは`totallyNotMaster`という名前のブランチを新しく作り、`o/master`への追跡プロパティを設定します。"]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["説明は十分でしょう、デモを見ていきましょう！`foo`という名前の新しいブランチをチェックアウトし、リモートの`master`への追跡プロパティを設定してみます。"],afterMarkdowns:["私たちは暗黙の取り込み先である`o/master`を使って、`foo`ブランチを更新します。`master`は更新されないことに注意してください！！"],command:"git checkout -b foo o/master; git pull",beforeCommand:"git clone; git fakeTeamwork"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["これは`git push`にも適用されます"],afterMarkdowns:["わーお。全く違う名前がつけられているブランチですが、リモートの`master`に私たちの作業をプッシュできました。"],command:"git checkout -b foo o/master; git commit; git push",beforeCommand:"git clone"}},{type:"ModalAlert",options:{markdowns:["### 二番目の方法","","ブランチのリモートトラッキングを設定するもう一つの方法は、単に`git branch -u`オプションを使うというものです。例えば以下のようにです","","`git branch -u o/master foo`","","これは、`foo`ブランチを`o/master`を追跡するように設定します。もし、`foo`が現在チェックアウトしているブランチだった場合、以下のように省略することができます:","","`git branch -u o/master`",""]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["実際に素早く、もう一つの方法でリモートトラッキングを指定する様子を見てみましょう..."],afterMarkdowns:["前回と一緒で、より明示的なコマンドですね。とてもいい感じです！"],command:"git branch -u o/master foo; git commit; git push",beforeCommand:"git clone; git checkout -b foo"}},{type:"ModalAlert",options:{markdowns:["OK！このレベルでは、ローカルで`master`にチェックアウトしていない状態で、リモートの`master`ブランチに作業をプッシュしてみましょう。これは高度な課題ですから、理解するのに少し時間をおく必要があると言っておきます:P"]}}]},ko:{childViews:[{type:"ModalAlert",options:{markdowns:["### 원격-추적 브랜치","",'지난 몇개의 레슨에서 "마법"처럼 보일 수 있는게 하나 있었는데, git이 `master`브랜치가 `o/master`와 연관 되어있는걸 안다는 것입니다. 물론 이 두 브랜치가 이름이 비슷하기 때문에 로컬 `master`브랜치가 원격의 `master`브랜치와 연결 되어있다고 하자면 어찌 논리적으로 말이 되긴 합니다만..., 이 연결은 두가지 시나리오를 통해 뚜렷하게 확인이 됩니다:',"","* pull 작업을 하는 도중, 커밋들은 `o/master`에 내려받아 지고 그다음 `master` 브랜치로 *merge*됩니다. merge에서 내재된 타겟은 이 연결에서 결정합니다.","* push 작업을 하는 도중, `master` 브랜치의 작업은 원격의 `master`브랜치(로컬에서 `o/master`로 표현되는)로 push 됩니다. push의 *목적지*는 master와 `o/master`의 연결에서 결정됩니다.",""]}},{type:"ModalAlert",options:{markdowns:["## 원격 추적","",'간단히 말해서, 이 `master`와 `o/master`사이의 연결은 브랜치의 "원격 추적" 속성을 통해 간단하게 설명됩니다. `master`브랜치는 `o/master`브랜치를 추적하도록 설정되어 있습니다 -- 이것은 `master`가 merge와 push할 내재된 목적지가 생겼다는 뜻 입니다.',"","여러분은 어떻게 이 속성을 지정해주는 그 어떤 명령어 없이 `master` 브랜치에 설정되있는지 궁금할것 입니다. 사실, 여러분이 git으로 저장소를 clone할때 이 속성이 여러분을 위해 자동으로 설정 됩니다.","","clone을 진행하면서 git은 원격 저장소에있는 모든 브랜치에 대해 로컬에 원격 브랜치를 생성합니다(`o/master`같은것들 말이죠). 그 후 원격 저장소에서 현재 active한 브랜치를 추적하는 로컬 브랜치를 생성합니다, 대부분의 경우 `master`가 됩니다.","","git clone이 완료되면, 여러분은 오로지 하나의 로컬 브랜치를 가지게 됩니다(부담스럽지 않도록) 물론 원격 저장소에있는 여러 다른 브랜치도 여전히 확인할 수 있습니다(호기심이 많으시다면). 로컬, 원격 저장소 양쪽에 최적화 되있는거죠!","","여러분이 clone을 할 때 아래의 명령어를 볼 수도 있는 이유입니다:","",'    local branch "master" set to track remote branch "o/master"']}},{type:"ModalAlert",options:{markdowns:["### 내 스스로 지정할수도 있나요?","","당연하죠! 여러분은 아무 임의의 브랜치를 `o/master`를 추적하게 만들 수 있습니다. 이렇게 하면 이 브랜치 또한 내재된 push,merge 목적지를 `master`로 할 것입니다. 여러분은 이제 `totallyNotMaster`라는 브랜치에서 `git push`를 수행해서 원격 저장소의 브랜치 `master`로 작업을 push할 수 있습니다!","","이 속성을 설정하는데에는 두가지 방법이 있습니다. 첫 번째는 지정한 원격 브랜치를 참조해서 새로운 브랜치를 생성하여 checkout 하는 방법 입니다. 다음을 실행하면","","`git checkout -b totallyNotMaster o/master`","","`totallyNotMaster`라는 이름의 새 브랜치를 생성하고 `o/master`를 추적하게 설정합니다."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["설명은 충분히 한듯 합니다. 직접 확인해 봅시다! `foo`라는 이름의 새 브랜치를 checkout하고 이것을 원격 저장소의 `master`를 추적하도록 설정하겠습니다."],afterMarkdowns:["보이듯이, 우리는 `o/master`를 `foo` 브랜치를 갱신하기 위한 내재된 merge 타겟으로 사용하고 있습니다. master가 갱신되지 않는다는것을 눈치챘죠?"],command:"git checkout -b foo o/master; git pull",beforeCommand:"git clone; git fakeTeamwork"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["git push에도 적용이 됩니다"],afterMarkdowns:["Boom. 브랜치의 이름을 전혀 다른것으로 지었는데도 불구하고 우리 작업이 `master`로 push 되었습니다."],command:"git checkout -b foo o/master; git commit; git push",beforeCommand:"git clone"}},{type:"ModalAlert",options:{markdowns:["### 방법 #2","","브랜치에 원격 추적 설정을 하는 또 다른 방법으로는 간단하게 `git branch -u` 옵션을 사용하는 방법이 있습니다. 다음을 실행하면","","`git branch -u o/master foo`","","가 `foo` 브랜치가 `o/master`를 추적하도록 설정합니다. 만약 `foo`가 현재 작업하고 있는 브랜치라면 생략해도 됩니다:","","`git branch -u o/master`",""]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["자 이 다른 방법이 작동하는 모습을 확인해 봅시다..."],afterMarkdowns:["이전과 같습니다,  좀 더 분명하게 알 수 있느 명령어죠. 좋아요!"],command:"git branch -u o/master foo; git commit; git push",beforeCommand:"git clone; git checkout -b foo"}},{type:"ModalAlert",options:{markdowns:[" 이번 레벨에서는 로컬의 `master`브랜치가 아닌 다른 브랜치에서 작업을 원격 저장소의 `master`브랜치로 push하세요. 고급 과정이니 더 길게 설명하지는 않을게요 :p"]}}]},uk:{childViews:[{type:"ModalAlert",options:{markdowns:["### Гілки віддаленого стеження","",'Одна з речей в попередніх уроках, яка могла виглядати, наче "магія" -- це те, що гіт якось знає, що локальна гілка `master` відповідає віддаленій `o/master`. Звичайно, ці гілки мають схожі назви, і виглядає логічним співставити віддалену гілку `master` з локальною `master`, однак цей зв\'язок найкраще видно в двох випадках:',"","* Під час операції `pull`, коміти попадають в `o/master`, а вже потім *мерджаться* в локальний `master`. Гілка в яку відбудеться мердж якраз і визначається цим зв'язком.","* Під час операції `push`, коміти з гілки `master` переносяться у віддалений `master` (який локально представлений як `o/master`). *Гілка-призначення* для `push` визначена зв'язком між `master` і `o/master`.",""]}},{type:"ModalAlert",options:{markdowns:["## Гілки віддаленого стеження","",'В двох словах, цей зв\'язок між `master` та `o/master` і є тим "віддаленим стеженням", визначеним для гілки. Гілка `master` налаштована стежити за `o/master` -- це визначає неявну ціль для мерджу і неявне призначення під час операції `push` для гілки `master`.',"","Ви можете подумати, а як же такий зв'язок було встановлено, якщо я не виконував жодної команди? Ну, коли гіт клонує репозиторій, він встановлює цей зв'язок автоматично.","","Під час клонування гіт створює гілки для стеження за кожною гілкою віддаленого репозиторію (напр. `o/master`). Потім він створює локальну гілку, що пов'язана і стежить за активною гілкою у віддаленому репозиторії, яка в більшості випадків називається `master`.","","Після закінчення клонування у вас буде лише одна локальна гілка (щоб не перевантажувати) але ви можете переглянути всі віддалені гілки (якщо буде цікаво). Такий собі розумний компроміс!","","Це пояснює чому ви бачите наступне повідомлення під час клонування:","",'    local branch "master" set to track remote branch "o/master"']}},{type:"ModalAlert",options:{markdowns:["### А можу я сам вибирати?","","Так, можеш! Ти можеш вибрати довільну гілку, яка слідкуватиме за `o/master`, і тоді для цієї гілки `push` та `merge` автоматично працюватимуть з `master`. Це означає, що виконання `git push` в гілці з назвою `totallyNotMaster` (зовсім не master) може зберегти локальні коміти у віддалену гілку `master`!","","Є два шляхи встановити такий зв'язок. Перший - створити нову гілку з явним вказанням зв'язку (за ким слідкувати). Виконання","","`git checkout -b totallyNotMaster o/master`","","створить гілку `totallyNotMaster`, яка слідкує за `o/master`."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Досить розмов, подивімось в дії! Створімо нову гілку `foo` і змусьмо її слідкувати за віддаленою гілкою `master`."],afterMarkdowns:["Як видно з результату, при оновленні `foo` було використано автоматичний зв'язок з `o/master` під час операції `merge`. Зверніть увагу, `master` не було оновлено!"],command:"git checkout -b foo o/master; git pull",beforeCommand:"git clone; git fakeTeamwork"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Це також справджується і для git push"],afterMarkdowns:["Ка-бум!. Ми запушили наші зміни у віддалений `master`, незважаючи на те, що локальна гілка називалась зовсім по-іншому."],command:"git checkout -b foo o/master; git commit; git push",beforeCommand:"git clone"}},{type:"ModalAlert",options:{markdowns:["### Спосіб №2","","Інший спосіб вказати за якою віддаленою гілкою слідкувати -- просто використовувати опцію `git branch -u`. Виконання","","`git branch -u o/master foo`","","заставить гілку `foo` слідкувати за `o/master`. Якщо `foo` є поточною гілкою, її можна навіть не вказувати:","","`git branch -u o/master`",""]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Подивімось на цей спосіб швидко вказати віддалену гілку для відслідковування..."],afterMarkdowns:["Як і перший спосіб, але своя окрема команда."],command:"git branch -u o/master foo; git commit; git push",beforeCommand:"git clone; git checkout -b foo"}},{type:"ModalAlert",options:{markdowns:["Гаразд! На цьому рівні збережімо свою роботу у віддалену гілку `master` *без* переходу на локальну `master`. Про решту здогадайся сам, раз ти вже дойшов до цього рівня :P"]}}]},vi:{childViews:[{type:"ModalAlert",options:{markdowns:["### Theo dõi nhánh từ xa","",'Trong những bài học vừa qua có một điểu có vẻ như là "ma thuật" đó là git lại biết được nhánh `master` có liên kết đến nhánh `o/master`. Đúng là chúng có tên tương tự và nhánh `master` ở kho chứa từ xa có kết nối đến nhánh `master` ở kho chứa địa phương có vẻ như là hợp lý, nhưng kết nối này được thể hiện rõ ràng trong 2 trường hợp:',"","* Trong quá trình thực hiện thao tác kéo, các commit được tải xuống nhánh `o/master` và sau đó *hợp nhất* vào nhánh `master`. Mục tiêu hợp nhất dược ngầm định bởi kết nối này.","* Trong quá trình thực hiện thao tác đẩy, thảnh quả trên nhánh `master` được đẩy lên nhánh `master` từ xa (sau dó được biểu thị bằng nhánh `o/master` ở kho chứa địa phương). *Đích đến* của lệnh đẩy được xác định bằng kết nối giữa nhánh `master` và nhánh `o/master`.",""]}},{type:"ModalAlert",options:{markdowns:["## Theo dõi từ xa","",'Nói tóm lại, kết nối giữa nhánh `master` và nhánh `o/master` đơn giản được giải thích bằng thuộc tính "theo dõi từ xa" ("remote tracking") của các nhánh. Nhánh `master` được thiết lập để theo dõi nhánh `o/master` -- Điều này có nghĩa là nhánh `master` được chỉ định đích của lệnh đẩy và mục tiêu hợp nhất sau khi kéo.',"","Có thể bạn sẽ thắc mắc rằng tại sao thuộc tính này được thiết lập lên nhánh `master` trong khi bạn chẳng hề chạy một câu lệnh nào chỉ định điều này. Chà, khi bạn dùng git để nhân bản kho chứa, thì thuộc tính này đã được tự động thiết lập cho bạn rồi. ","","Trong quá trình thực hiện nhân bản, git tạo ra nhánh từ xa trên kho chứa địa phương cho tất cả các nhánh trên kho chứa từ xa (các nhánh như `o/master`). Sau đó nó sẽ tạo một nhánh địa phương theo dõi nhánh hoạt dộng hiện tại của kho chứa từ xa, đa phần các trường hợp là nhánh `master`.","","Một khi quá trình nhân bản hoàn thành, bạn sẽ chỉ có một nhánh địa phương (để bạn không thấy quá tải) nhưng bạn có thể thấy tất cả các nhánh trên kho chứa từ xa (phòng trường hợp bạn thấy tò mò). Đây là phương án tối ưu!","","Điều này giải thích việc sau khi nhân bản bạn có thể thấy dòng lệnh sau xuất hiện:","",'    local branch "master" set to track remote branch "o/master"']}},{type:"ModalAlert",options:{markdowns:["### Tôi có thể tự chỉ định chứ?","","Tất nhiên là được chứ! Bạn có thế khiến bất kỳ nhánh nào theo dõi nhánh `o/master`, và nếu bạn làm vậy, nhánh đó sẽ được được chỉ định đích của lệnh đẩy và mục tiêu hợp nhất giống như nhánh `master`. Điều này có nghĩa là bạn có thể chạy lệnh `git push` trên nhánh có tên là `totallyNotMaster` và thành quả của bạn sẽ được đẩy lên nhánh `master` ở kho chứa từ xa!","","Có 2 cách để thiết lập thuộc tính này. Cách đầu tiên là chuyển sang một nhánh mới từ một nhánh từ xa bằng cách thực hiện","","`git checkout -b totallyNotMaster o/master`","","Tạo ra một nhánh mới `totallyNotMaster` và thiết lập cho nó theo dõi nhánh `o/master`."]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Nói vậy là đủ rồi, hãy xem thử một mô tả nào! Ta sẽ chuyển sang một nhánh tên là `foo` và thiết lập cho nó theo dõi nhánh `master` trên kho chứa từ xa."],afterMarkdowns:["Như bạn đã thấy, chúng tôi đã sử dụng mục tiêu ngầm `o / master` để cập nhật nhánh` foo. Để ý rằng nhánh `master` không được cập nhật!!"],command:"git checkout -b foo o/master; git pull",beforeCommand:"git clone; git fakeTeamwork"}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Điểu này cũng được áp dụng cho lệnh git push"],afterMarkdowns:["Bùùm. Ta đã đẩy thành quả lên nhánh `master` ở kho chứa tù xa mặc dù nhánh của ta có tên hoàn toàn khác biệt"],command:"git checkout -b foo o/master; git commit; git push",beforeCommand:"git clone"}},{type:"ModalAlert",options:{markdowns:["### Cách thứ #2","","Cách khác để thiết lập theo dõi trên một nhánh đó là đơn giản sử dụng lệnh `git branch -u`. Thực hiện","","`git branch -u o/master foo`","","sẽ thiết lập nhánh `foo` theo dõi nhánh `o/master`. Nếu nhánh `foo` đang được `HEAD` trỏ tới bạn có thể bỏ tham số này:","","`git branch -u o/master`",""]}},{type:"GitDemonstrationView",options:{beforeMarkdowns:["Hãy xem thử cách khác để thiết lập theo dõi..."],afterMarkdowns:["Y hệt như trước, nhưng lệnh này biểu hiện rõ ràng hơn. Tuyệt!"],command:"git branch -u o/master foo; git commit; git push",beforeCommand:"git clone; git checkout -b foo"}},{type:"ModalAlert",options:{markdowns:["Được rồi! Ở cấp độ này hãy để thành quả lên nhánh `master` trên kho lưu trữ từ xa mà không chuyển sang nhánh `master` tại kho địa phương. Hãy tự tìm ra cách nhé, giờ là khóa học nâng cao rồi :P"]}}]}}}},{}]},{},[40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,76,77,78,79,80,81,82,83,84,85,86,87,88,90,89,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,69,71,70,72,73,74,75]);