viswanath11

Link to these links: https://git.io/vKSVZ

Module 1:

Run jenkins from war file: jenkins -jar jenkins.war
Run jenkins from docker:

docker run -d \
           --restart unless-stopped \
           --name jenkins \

A curated list of AWS resources to prepare for the AWS Certifications

A curated list of awesome AWS resources you need to prepare for the all 5 AWS Certifications. This gist will include: open source repos, blogs & blogposts, ebooks, PDF, whitepapers, video courses, free lecture, slides, sample test and many other resources.

Merge IS:

• git merge apply all unique commits from branch A into branch B in one commit with final result • git merge doesn’t rewrite commit history, just adds one new commit

Rebase is:

• git rebase gets all unique commits from both branches and applies them one by one • git rebase rewrites commit history but doesn’t create extra commit for merging

Differences between git merge and git rebase

Git/Github step-by-step Workflow

Step-by-step guide for creating a feature or bugfix branch, submit it for code review as a pull request and once approved, merge upstream. This guide is intended for internal developers with push access to all relevant repos.

You should understand rebasing and squashing. For a very good explanation on rebasing and squashing with pull requests see How to Rebase a Pull Request. Also worth reading is the Hacker's Guide to Git.

Setup

Git Workflow

When using Git Version Control you have quite a few workflow variations. Which one you choose depends on your team and what fits your requirements and usage more appropriately.

Here are some popular options that will be described later in this document:

Git 'Centralised' Workflow
Git 'Feature Branches' Workflow
Git 'Gitflow' Workflow
Git 'Single Commit/No Branches' Workflow

	<?xml version='1.0' encoding='UTF-8'?>
	<project>
	<actions/>
	<description></description>
	<keepDependencies>false</keepDependencies>
	<properties/>
	<scm class="hudson.plugins.git.GitSCM" plugin="[email protected]">
	<configVersion>2</configVersion>
	<userRemoteConfigs>
	<hudson.plugins.git.UserRemoteConfig>

	stage 'CI'
	node {

	git branch: 'jenkins2-course',
	url: 'https://github.com/g0t4/solitaire-systemjs-course'

	// pull dependencies from npm
	// on windows use: bat 'npm install'
	bat 'npm install'

	# https://docs.docker.com/compose/yml/
	# Each service defined in docker-compose.yml must specify exactly one of
	# image or build. Other keys are optional, and are analogous to their
	# docker run command-line counterparts.
	#
	# As with docker run, options specified in the Dockerfile (e.g., CMD,
	# EXPOSE, VOLUME, ENV) are respected by default - you don't need to
	# specify them again in docker-compose.yml.
	#
	service_name:

	#!/bin/bash

	# https://gist.github.com/robwierzbowski/5430952/
	# Create and push to a new github repo from the command line.
	# Grabs sensible defaults from the containing folder and `.gitconfig`.
	# Refinements welcome.

	# Gather constant vars
	CURRENTDIR=${PWD##*/}
	GITHUBUSER=$(git config github.user)

	git fetch
	git rebase origin/master


	#Source: http://stackoverflow.com/questions/7200614/how-to-merge-remote-master-to-local-branch

	#git merge branchname takes new commits from the branch branchname, and adds them to the current branch. If necessary, it automatically adds a "Merge" commit on top.

	#git rebase branchname takes new commits from the branch branchname, and inserts them "under" your changes. More precisely, it modifies the history of the current branch such that it is based on the tip of branchname, with any changes you made on top of that.