Skip to content

Instantly share code, notes, and snippets.

View maqdev's full-sized avatar

Mag A maqdev

13 followers · 6 following
View GitHub Profile
@maqdev
maqdev / git-chain-conflicts.md
Last active January 24, 2024 22:44
Resolving git conflicts for chained PRs after squash/merge commit

Assuming that there was a:

  • PR1 based on branch main
  • PR2 based on PR1

And after squash-merging PR1 into the main branch, sometimes we can't just merge PR2 due to a conflicts arising from the commits in PR1 being squashed.

Here's the step-by-step explanation of the Git workflow to resolve this issue:

  1. git switch main
@maqdev
maqdev / keybase.md
Last active September 18, 2019 16:08

Keybase proof

I hereby claim:

  • I am maqdev on github.
  • I am maqdev (https://keybase.io/maqdev) on keybase.
  • I have a public key ASCYGQyAOLIJDytEeVaroAeHNsH1gylbNQznEzgyqk79Lgo

To claim this, I am signing this object:

@maqdev
maqdev / nginx-cors.conf
Created February 13, 2017 00:08 — forked from sbuzonas/nginx-cors.conf
Nginx CORS maps
map $http_origin $allow_origin {
default "";
"~^https?://(?:[^/]*\.)?(stevebuzonas\.(?:com|local))(?::[0-9]+)?$" "$http_origin";
}
map $request_method $cors_method {
default "allowed";
"OPTIONS" "preflight";
}
@maqdev
maqdev / akka-cluster-problem
Created September 22, 2015 16:19
2015-09-15T11:35:43.000+02:00 mks1-lc WARN Association with remote system [akka.tcp://eu-inn@cpb10-lc.local.com:10004] has failed, address is now gated for [5000] ms. Reason: [Association failed with [akka.tcp://eu-inn@cpb10-lc.local.com:10004]] Caused by: [Connection refused: cpb10-lc.lux....
2015-09-15T11:35:41.000+02:00 mks1-lc WARN Association with remote system [akka.tcp://eu-inn@cpb12-lc.local.com:10004] has failed, address is now gated for [5000] ms. Reason: [Association failed with [akka.tcp://eu-inn@cpb12-lc.local.com:10004]] Caused by: [Connection refused: cpb12-lc.lux....
2015-09-15T11:35:39.000+02:00 mks1-lc WARN Association with remote system [akka.tcp://eu-inn@cpb12-lc.local.com:10005] has failed, address is now gated for [5000] ms. Reason: [Association failed with [akka.tcp://eu-inn@cpb12-lc.local.com:10005]] Caused by: [Connection refused: cpb12-lc.lux....
2015-09-15T11:35:38.000+02:00 mks1-lc WARN Association with remote system [akka.tcp://eu-inn@cpb11-lc.local.com:10004] has failed, address
@maqdev
maqdev / gist:b62106128b0e00972598
Last active May 17, 2017 04:19 — forked from syshen/gist:c24d127e1adc2783e0e7
set -e
######################
# Options
######################
REVEAL_ARCHIVE_IN_FINDER=false
FRAMEWORK_NAME="${PROJECT_NAME}"
@maqdev
maqdev / sbtproject.sh
Last active August 29, 2015 14:13 — forked from alvinj/sbtmkdirs.sh
Create SBT Project Structure
#!/bin/bash
#------------------------------------------------------------------------------
# Name: sbtmkdirs
# Purpose: Create an SBT project directory structure with a few simple options.
# Author: Alvin Alexander, http://alvinalexander.com
# Info: http://alvinalexander.com/sbtmkdirs
# License: Creative Commons Attribution-ShareAlike 2.5 Generic
# http://creativecommons.org/licenses/by-sa/2.5/
# Updated: Magomed Abdurakhmanov, http://github.com/maqdev