Abhishek koserwal akoserwal

Git-in-Real: Lesson 3

Merge-Conflicts

You will encounter conflict when working within in a team or even working on your own project.

Let's create a conflicting situation and confuse the git system.

git checkout Ch3-conflict

Git-in-Real: Lesson 2

Amend: Rewriting history

While writing this lesson I commited this file and forget to add a file. Also my commit message is not correct. As you have already checked-out this branch. It's your responsibility to fix my lesson.

Question in your mind! how?

git commit --amend

Git-in-Real: Lesson 1

Remotes: Adding a remote location to where you can publish your repository. You can add mutiple remote location.

To Check remote locations

git remote -v

	{
	"movies": [ "Iron Man (2008)",
	"The Incredible Hulk (2008)",
	"Iron Man 2 (2010)",
	"Thor (2011)",
	"Captain America: The First Avenger (2011)",
	"Marvel's The Avengers (2012)",
	"Iron Man 3 (2013)",
	"Thor: The Dark World (2013)",
	"Captain America: The Winter Soldier (2014)",

	<!DOCTYPE html>
	<html>
	<head>
	<meta name="description" content="[iterator & observer]">
	<meta charset="utf-8">
	<meta name="viewport" content="width=device-width">
	<title>JS Bin</title>
	</head>
	<body>

	console.clear();

	var Subject = function() {
	var self = this;
	self.observers = [];

	return {
	subscribe: function(observer) {
	self.observers.push(observer);
	},

	<!DOCTYPE html>
	<html>
	<head>
	<meta charset="utf-8">
	<meta name="viewport" content="width=device-width">
	<title>RxJS 5 Operators</title>
	<script src="https://npmcdn.com/@reactivex/[email protected]/dist/global/Rx.umd.js"></script>
	</head>
	<body>

	<pfng-notification-drawer
	[title]="'Notifications Drawer'"
	[notificationGroups]="groups"
	[titleTemplate]="titleTemplate"
	[headingTemplate]="headingTemplate"
	> </pfng-notification-drawer>