Skip to content

Instantly share code, notes, and snippets.

@blackfalcon
blackfalcon / git-feature-workflow.md
Last active April 13, 2024 07:33
Git basics - a general workflow

Git-workflow vs feature branching

When working with Git, there are two prevailing workflows are Git workflow and feature branches. IMHO, being more of a subscriber to continuous integration, I feel that the feature branch workflow is better suited, and the focus of this article.

If you are new to Git and Git-workflows, I suggest reading the atlassian.com Git Workflow article in addition to this as there is more detail there than presented here.

I admit, using Bash in the command line with the standard configuration leaves a bit to be desired when it comes to awareness of state. A tool that I suggest using follows these instructions on setting up GIT Bash autocompletion. This tool will assist you to better visualize the state of a branc

@jaceklaskowski
jaceklaskowski / deployment-tool-ansible-puppet-chef-salt.md
Last active January 3, 2024 22:12
Choosing a deployment tool - ansible vs puppet vs chef vs salt

Requirements

  • no upfront installation/agents on remote/slave machines - ssh should be enough
  • application components should use third-party software, e.g. HDFS, Spark's cluster, deployed separately
  • configuration templating
  • environment requires/asserts, i.e. we need a JVM in a given version before doing deployment
  • deployment process run from Jenkins

Solution

@gorde
gorde / gist:0fc505d246b47c8d8013322ba7b1ee0c
Created March 20, 2019 15:07
To Identify my keybase account
curl \
--data-urlencode sig="$(\
echo '{"body":{"key":{"eldest_kid":"01200eac32fdbdf70acb8aabb5d4edc56d1419f19cee3e3822d91771698caca75ada0a","fingerprint":"960ed3761bd4dfc7de82b5d0c79a879a933f5b56","host":"keybase.io","key_id":"c79a879a933f5b56","kid":"0101c2597b50954ff8de4188cae174b8670af62f46acba27540bce8cd8898561233f0a","uid":"92aff705fa2d96fc5475e27da46fbf19","username":"esm858"},"service":{"name":"github","username":"gorde"},"type":"web_service_binding","version":1},"ctime":1553094233,"expire_in":157680000,"prev":"c0728fbebf009152893af982c3466175618b83f0925b38ae35491f50974cccff","seqno":16,"tag":"signature"}' | \
gpg -u '960ed3761bd4dfc7de82b5d0c79a879a933f5b56' -a --sign)" \
--data-urlencode type="web_service_binding.github" \
--data-urlencode csrf_token="lgHZIDkyYWZmNzA1ZmEyZDk2ZmM1NDc1ZTI3ZGE0NmZiZjE5zlySUgvOAxcEAMDEILYiJ0lFOW5/Rh0gJwvDQIOvKim+fIRYWXUKnoudoJuX" \
--data-urlencode plain_out="1" \
--data-urlencode session="kyjEEJKv9wX6LZb8VHXifaRvvxnEEFwnupRBJeugqo9kRbbV3jM=" \
--data-