How to Ignore Merge Conflicts for Specific Files in a Git Repository
Create a directory and git init
it
$ mkdir merge-test
$ cd merge-test/
$ git init
/* styles for '...' */ | |
.block-with-text { | |
/* hide text if it more than N lines */ | |
overflow: hidden; | |
/* for set '...' in absolute position */ | |
position: relative; | |
/* use this value to count block height */ | |
line-height: 1.2em; | |
/* max-height = line-height (1.2) * lines max number (3) */ | |
max-height: 3.6em; |
How to Ignore Merge Conflicts for Specific Files in a Git Repository
Create a directory and git init
it
$ mkdir merge-test
$ cd merge-test/
$ git init
(by @andrestaltz)
If you prefer to watch video tutorials with live-coding, then check out this series I recorded with the same contents as in this article: Egghead.io - Introduction to Reactive Programming.
import { Component, Input } from '@angular/core'; | |
import { FormControl } from '@angular/forms'; | |
import { ValidationService } from './validation.service'; | |
@Component({ | |
selector: 'exe-control-messages', | |
template: ` | |
<div *ngIf="errorMessage"> | |
<span>{{ errorMessage.message }}</span> |
.markdown-here-wrapper{font-size:17px; line-height:30px;} | |
pre, code{font-size:14px; font-family: Roboto, 'Courier New', Consolas, Inconsolata, Courier, monospace;} | |
code{margin:0 3px; padding:0 6px; white-space: pre-wrap; background-color:#F8F8F8; border-radius:2px; display: inline;} | |
pre{font-size:15px; line-height:20px;}precode{ white-space: pre; overflow: auto; border-radius:3px; padding:5px10px; display: block !important;} | |
strong, b{color:#BF360C;} | |
em, i{color:#009688;} | |
big{font-size:22px; color:#009688; font-weight: bold; vertical-align: middle; border-bottom:1px solid #eee;} | |
small{font-size:12px; line-height:22px;} | |
hr{border-bottom:0.05em dotted #eee; margin:10px auto;} | |
p{margin:15px 5px!important;} |
<!DOCTYPE html> | |
<html lang="en"> | |
<head> | |
<meta charset="UTF-8"> | |
<title>Web Notifications API</title> | |
</head> | |
<body> | |
<button id="notificationsBtn">发送通知</button> | |
<script> | |
document.addEventListener('DOMContentLoaded', initNotification, false); |
An ongoing project to catalogue all of these sneaky, hidden, bleeding edge selectors as I prepare my JSConf EU 2012 talk.
Everything is broken up by tag, but within each the selectors aren't particularly ordered.
I have not tested/verified all of these. Have I missed some or got it wrong? Let me know. - A
A friendly reminder that you may need to set this property on your target/selected element to get the styling results you want:
-webkit-appearance:none;
I am moving this gist to a github repo so more people can contribute to it. Also, it makes it easier for me to version control.
Please go to - https://github.com/praveenpuglia/shadow-dom-in-depth for latest version of this document. Also, if you find the document useful, please shower your love, go ⭐️ it. :)
Heads Up! It's all about the V1 Spec.
In a nutshell, Shadow DOM enables local scoping for HTML & CSS.