Install command line tools:
then run this:
git config --global diff.tool bc3
git config --global difftool.bc3 trustExitCode true
git config --global merge.tool bc3
| # syntax = docker/dockerfile:experimental | |
| FROM python:3.6 as base | |
| ###################################### | |
| FROM base as builder | |
| ENV PYTHONPATH=$PYTHONPATH:/install/lib/python3.6/site-packages/ | |
| # bind a wheel and install it |
| import hudson.model.Action | |
| import com.cloudbees.workflow.flownode.FlowNodeUtil | |
| import com.cloudbees.workflow.rest.external.StatusExt | |
| import org.jenkinsci.plugins.workflow.graph.FlowNode | |
| import org.jenkinsci.plugins.workflow.cps.nodes.StepStartNode | |
| import org.jenkinsci.plugins.workflow.cps.nodes.StepEndNode | |
| import org.jenkinsci.plugins.workflow.actions.LabelAction |
| # | |
| # This playbook assumes the WebSphere MQ file provided by IBM has already been | |
| # downloaded to a specific directory (target.wd) on the server. | |
| # | |
| # ${target.wd} is a variable representing the working directory on the target | |
| # server the MQ client will be installed. | |
| # | |
| # Note: Although this playbook is designed to be able to be run independently, | |
| # it is in fact part of a longer playbook and therefore may have some other | |
| # unexpected dependencies not reflected here. |
| import uuid | |
| import wtforms_json | |
| from sqlalchemy import not_ | |
| from sqlalchemy.dialects.postgresql import UUID | |
| from wtforms import Form | |
| from wtforms.fields import FormField, FieldList | |
| from wtforms.validators import Length | |
| from flask import current_app as app | |
| from flask import request, json, jsonify, abort |
| #!/bin/bash | |
| # Git post checkout hook. | |
| # Reminds you of South migration changes when switching branches. | |
| # Can be useful when you are when you are testing out a branch from | |
| # someone else that requires migrations. | |
| # Put the file in .git/hooks/post-checkout | |
| PREVIOUS_HEAD=$1 | |
| NEW_HEAD=$2 |