devinschumacher

title	How to do a "dry run" of a git merge to see what would happen without actually committing to it.
tags	git github git merge git diff

How to do a "dry run" of a git merge to see what would happen without actually committing to it.

Example: You have a local project, and you're on the local branch called dev. You haven't started working yet, but there may have been other activity since you originally cloned the remote dev branch, and you want to see how your branch compares to the remote dev branch so you can get in sync before starting to code - but you don't want to just git pull and risk conflicts, or losing info.

caiofcm

Add git bash to Windows Terminal

• Install Windows Terminal
• Install Git Bash
• Go to Windows Terminal Settings
  • New profile
  • Command line: Search or something as "C:\Program Files\Git\bin\bash.exe"
  • Initial dir: "%USERPROFILE%"
• Can choose a Icon (from the git-gui folder for instance)

enagy27

import React from 'react';
import { render } from '@testing-library/react';

import { queryAllByTableHeader } from './tables';

describe('table testing utils', () => {
  it('test', () => {
    render(
      <div role="region" aria-labelledby="caption-id">
        <table>

tamagosante

// https://developer.mozilla.org/en-US/docs/Web/HTTP/Basics_of_HTTP/MIME_types/Common_types

enum MimeTypes {
  ".aac" = "audio/aac",
  ".abw" = "application/x-abiword",
  ".arc" = "application/x-freearc",
  ".avi" = "video/x-msvideo",
  ".azw" = "application/vnd.amazon.ebook",
  ".bin" = "application/octet-stream",
  ".bmp" = "image/bmp",

estorgio

Mounting VirtualBox shared folders on Ubuntu Server 18.04 LTS (Bionic Beaver)

This guide will walk you through the steps on how to setup a VirtualBox shared folder inside your Ubuntu Server guest.

Prerequisites

This guide assumes that you are using the following setup:

• Oracle VM VirtualBox version 6.0.10 with Extension Pack installed
• Microsoft Windows 7 SP1 as the host OS
• A fresh install of Ubuntu Server 18.04.2 LTS as the guest OS

You could still make this guide work with other setups (possibly with some modifications to the commands and whatnot).

inoccu