ilyar

We can’t automatically merge this pull request.

Use the command line to resolve conflicts before continuing.

Checkout via command line If you cannot merge a pull request automatically here, you have the option of checking it out via command line to resolve conflicts and perform a manual merge.

Step 1: From your project repository, check out a new branch and test the changes.

Install gitflow on Windows

Download and install Git from MSysGit or Git SCM. Download and install getopt.exe from the util-linux package into C:\Program Files\Git\bin. (Only getopt.exe, the others util-linux files are not used). Also install libintl3.dll and libiconv2.dll from the Dependencies packages (libintl and libiconv), into the same directory.

Suppose that Git is installed in the folder c:\bin\git and GnuWin32 in the folder c:\bin\GnuWin32.

Clone the git-flow sources from GitHub:

$ git clone --recursive git://github.com/nvie/gitflow.git

Git Рабочий процесс

Внимание!

Для выполнения каких-либо команд по проекту, надо находиться в консоли в каталоге проекта. Переход в каталог проекта осуществляется командой: cd projectname, где projectname - это название проекта

Это инструкция для выполнения задачи в проекте.

1 Переключиться на ветку мастер и актуализировать ее. Клонировать проект и устанавливать утилиты снова не нужно!

Troubleshooting

tip

# — Command execution in privileged mode

$ — Command execution in user mode

	cl_red='\[\033[0;31m\]'
	cl_RED='\[\033[1;31m\]'
	cl_green='\[\033[0;32m\]'
	cl_GREEN='\[\033[1;32m\]'
	cl_yellow='\[\033[0;33m\]'
	cl_YELLOW='\[\033[1;33m\]'
	cl_blue='\[\033[0;34m\]'
	cl_BLUE='\[\033[1;34m\]'
	cl_purple='\[\033[0;35m\]'
	cl_PURPLE='\[\033[1;35m\]'

	#!/bin/bash

	wget -c http://download.virtualbox.org/virtualbox/4.3.8/VBoxGuestAdditions_4.3.8.iso -O VBoxGuestAdditions.iso
	sudo mount VBoxGuestAdditions.iso -o loop /mnt
	sudo sh /mnt/VBoxLinuxAdditions.run --nox11
	rm VBoxGuestAdditions.iso

	({
	block: 'page',
	title: 'index',
	head: [
	{ elem: 'css', url: '_index.css', ie: false},
	{ elem: 'css', url: '_index.ie.css', ie: true },
	{ block: 'i-jquery', elem: 'core'},
	{ elem: 'js', url:'_index.js'},
	],
	content: [

	#!/bin/bash

	# curl -sL https://deb.nodesource.com/setup_0.10 \| sudo bash -
	# or
	# wget -qO- https://deb.nodesource.com/setup_0.10 \| sudo bash -
	# or
	# curl -sL https://deb.nodesource.com/setup_0.12 \| sudo bash -
	# or
	# wget -qO- https://deb.nodesource.com/setup_0.12 \| sudo bash -
	# sudo apt-get install -qq -y nodejs

	#!/bin/bash

	# sevien

	# Setup minimal environment for use virtual machines on VirtualBox 4.3 and Vagrant 1.7.2 (plugins: cachier, hostmanager)

	codename=$(lsb_release --codename \| cut -f2)
	arch=$(uname -m)

	# VirtualBox

	# frontend
	server {
	listen 80;
	server_name yii2.lo;
	server_tokens off;

	client_max_body_size 128M;
	charset utf-8;

	access_log /var/log/nginx/yii2-access.log main buffer=50k;