background preloader

Code School

Code School
Related:  ANGULARGit

angular/angular-phonecat Basic Branching and Merging Basic Branching First, let’s say you’re working on your project and have a couple of commits already on the master branch. Figure 18. You’ve decided that you’re going to work on issue #53 in whatever issue-tracking system your company uses. $ git checkout -b iss53 Switched to a new branch "iss53" $ git branch iss53 $ git checkout iss53 Figure 19. You work on your website and do some commits. $ vim index.html $ git commit -a -m 'added a new footer [issue 53]' Figure 20. Now you get the call that there is an issue with the website, and you need to fix it immediately. However, before you do that, note that if your working directory or staging area has uncommitted changes that conflict with the branch you’re checking out, Git won’t let you switch branches. $ git checkout master Switched to branch 'master' At this point, your project working directory is exactly the way it was before you started working on issue #53, and you can concentrate on your hotfix. Next, you have a hotfix to make.

iio Engine · Home Made with Angular Viewing the Commit History After you have created several commits, or if you have cloned a repository with an existing commit history, you’ll probably want to look back to see what has happened. The most basic and powerful tool to do this is the git log command. These examples use a very simple project called “simplegit”. To get the project, run $ git clone When you run git log in this project, you should get output that looks something like this: By default, with no arguments, git log lists the commits made in that repository in reverse chronological order – that is, the most recent commits show up first. A huge number and variety of options to the git log command are available to show you exactly what you’re looking for. One of the more helpful options is -p, which shows the difference introduced in each commit. This option displays the same information but with a diff directly following each entry. Another really useful option is --pretty. Limiting Log Output

4. Declaración de elementos en XML Schema XSD - Todo XML Cómo se declaran elementos: Todos los elementos que se vayan a usar en el ejemplar XML tienen que declararse en el esquema. Las declaraciones de elementos en XML Schema tienen esta sintaxis: <xsd:element name="nombreElemento" type="tipoSimple/tipoComplejo" minOccurs="valor" maxOccurs="valor" fixed=”valor" default=”valor”/> name: es el nombre del elementotype: el tipo de elemento. <xsd:element name=”fecha” type=”xsd:date”/>:element name=”fecha” type=”xsd:date”/> Declaramos un elemento llamado “fecha”, de tipo “date” (el prefijo xsd: indica que este tipo de datos “date” es parte del vocabulario de XML Schema). Tipos complejos: estos elementos pueden incluir otros elementos y/o atributos. <xsd:complexType> y la correspondiente de cierre </xsd:complexType>. Declaramos el elemento “libro”, que es de tipo complejo. minOccurs y maxOccurs (Opcionales) : estos dos atributos indican el mínimo (minOccurs) y máximo (maxOccurs) número de ocurrencias del elemento. 5.2 Modelos de contenido para elementos

AngularJS : le framework JavaScript de Google au crible La popularité du framework JavaScript ne cesse de croitre. Quelles sont ses véritables points forts comparés à ses concurrents ? Qu'apporte AngularJS 2.0 qui vient de sortir ? Télécharger AngularJS (site du projet)1- AngularJS est devenu la référence des infrastructures JavaScript côté client Sur le terrain des infrastructures JavaScript, historiquement très nombreuses, plusieurs solutions commencent à s'imposer. Sur la partie serveur, Node.js a de plus en plus clairement remporté la bataille. Mais qu'en est-il des infrastructures JavaScript côté client ? D'après les premiers indicateurs dont nous disposons autour de la valorisation de l'expertise Angular en termes de salaire, il semble qu'elle commence à être assez élevée en France. A lire aussi : 2- Une infrastructure Modèle-Vue-VueModèle pour gagner en productivité En trois ans, la popularité d'AngularJS a explosé (cf. le graphique Google Trend ci-dessous). 3- Ce qui fait sa force : un projet porté par Google 5- Qu'apporte AngularJS 2 ?

How to undo (almost) anything with Git