fatal: refusing to merge unrelated histories
git merge --allow-unrelated-histories origin/<branch-name>
or
git pull origin <branch-name> --allow-unrelated-histories
{ | |
"presets": [ | |
[ | |
"env", | |
{ | |
"targets": { | |
"browsers": [ | |
"last 2 versions", | |
"safari 7" | |
] |
const homeAbout = { | |
name: "home.about", | |
url: "/about", | |
component: "homeAboutComponent", | |
lazyLoad: ($transition$) => { | |
const $ocLazyLoad = $transition$.injector().get("$ocLazyLoad"); | |
return require.ensure([], () => { | |
// load whole module | |
let module = require("./about/about.module"); |
const homeIndex = { | |
name: "home", | |
url: "/home", | |
component: "homeComponent", | |
lazyLoad: ($transition$) => { | |
const $ocLazyLoad = $transition$.injector().get("$ocLazyLoad"); | |
return require.ensure([], () => { | |
// load whole module | |
const module = require("./index/index.module"); |
{ | |
"color_scheme": "Packages/Predawn/predawn.tmTheme", | |
"copy_with_empty_selection": false, | |
"default_line_ending": "unix", | |
"draw_white_space": "all", | |
"ensure_newline_at_eof_on_save": true, | |
"font_size": 22, | |
"highlight_line": true, | |
"highlight_modified_tabs": true, | |
"ignored_packages": [ |
fatal: refusing to merge unrelated histories
git merge --allow-unrelated-histories origin/<branch-name>
or
git pull origin <branch-name> --allow-unrelated-histories
alias gst='git status' | |
alias gf='git fetch' | |
alias gm='git merge' | |
alias gd='git diff' | |
alias gb='git branch' | |
alias gbm='git branch --merged' | |
alias gcm='git commit -m' | |
alias gp='git push origin' | |
alias gbd='git branch -D' | |
alias gshorth='git log -p -2' |
#!/bin/bash | |
# clone vendors repositories to ./core/vendors | |
REPO_NAME="terminalForCoder__WSD" | |
PATH_TO_CORE="${HOME}/${REPO_NAME}/bash/core" | |
PATH_TO_VENDORS_REPO="${HOME}/${REPO_NAME}/vendors" | |
# array with repositories | |
repositories=( "https://github.com/larscmagnusson/CSS3MultiColumn.git" "https://github.com/tc39/test262.git" "https://github.com/postcss/postcss" "https://github.com/webpack/webpack" "https://github.com/var-bin/spriteFactory.git" "https://github.com/var-bin/backbone-training.git" "https://github.com/var-bin/flex-grid-framework.git" "https://github.com/var-bin/BrandButtons.git" "https://github.com/var-bin/less-easings.git" ) | |
i=0 # start el |
#!/bin/bash | |
# up_repo.sh - check repositories in core/vendor | |
# find all directories that included .git | |
# If any repo hasn't switched on master branch | |
# than git checkout master && git branch && git pull | |
# else git branch && git pull | |
# get list of repositories | |
findRepo() { |
#!/bin/bash | |
# clean_dist.sh - clean dist for current theme | |
# ./clean_dist.sh - clean all directories with dists | |
# ./clean_dist.sh <theme> - clean <theme> dist | |
cleanDist() { | |
theme="$1" | |
DIST_NAME="_dist" |
#!/bin/bash | |
PATH_TO_DIFF_DIR="${HOME}/diff/" | |
FILE_EXTENTION=".diff" | |
USER_NAME="<user_name>" | |
USER_PASSWORD="<user_password>" | |
PROJECT_NAME="<project_name>" | |
# if "$1" is empty |