Chris Sandvik csandman

Whether you're trying to give back to the open source community or collaborating on your own projects, knowing how to properly fork and generate pull requests is essential. Unfortunately, it's quite easy to make mistakes or not know what you should do when you're initially learning the process. I know that I certainly had considerable initial trouble with it, and I found a lot of the information on GitHub and around the internet to be rather piecemeal and incomplete - part of the process described here, another there, common hangups in a different place, and so on.

In an attempt to coallate this information for myself and others, this short tutorial is what I've found to be fairly standard procedure for creating a fork, doing your work, issuing a pull request, and merging that pull request back into the original project.

Creating a Fork

Just head over to the GitHub page and click the "Fork" button. It's just that simple. Once you've done that, you can use your favorite git client to clone your repo or j

Combining two git repositories

Use case: You have repository A with remote location rA, and repository B (which may or may not have remote location rB). You want to do one of two things:

preserve all commits of both repositories, but replace everything from A with the contents of B, and use rA as your remote location
actually combine the two repositories, as if they are two branches that you want to merge, using rA as the remote location

NB: Check out git subtree/git submodule and this Stack Overflow question before going through the steps below. This gist is just a record of how I solved this problem on my own one day.

Before starting, make sure your local and remote repositories are up-to-date with all changes you need. The following steps use the general idea of changing the remote origin and renaming the local master branch of one of the repos in order to combine the two master branches.

Revert the full commit

Sometimes you may want to undo a whole commit with all changes. Instead of going through all the changes manually, you can simply tell git to revert a commit, which does not even have to be the last one. Reverting a commit means to create a new commit that undoes all changes that were made in the bad commit. Just like above, the bad commit remains there, but it no longer affects the the current master and any future commits on top of it.

git revert {commit_id}

About History Rewriting

Delete the last commit

Deleting the last commit is the easiest case. Let's say we have a remote origin with branch master that currently points to commit dd61ab32. We want to remove the top commit. Translated to git terminology, we want to force the master branch of the origin remote repository to the parent of dd61ab32:

	{
	".123" : "application/vnd.lotus-1-2-3",
	".3dml" : "text/vnd.in3d.3dml",
	".3g2" : "video/3gpp2",
	".3gp" : "video/3gpp",
	".a" : "application/octet-stream",
	".aab" : "application/x-authorware-bin",
	".aac" : "audio/x-aac",
	".aam" : "application/x-authorware-map",
	".aas" : "application/x-authorware-seg",

	// this is the background code...

	// listen for our browerAction to be clicked
	chrome.browserAction.onClicked.addListener(function (tab) {
	// for the current tab, inject the "inject.js" file & execute it
	chrome.tabs.executeScript(tab.ib, {
	file: 'inject.js'
	});
	});

	// config/passport.js

	// load all the things we need
	var LocalStrategy = require('passport-local').Strategy;

	var mysql = require('mysql');

	var connection = mysql.createConnection({
	host : 'localhost',
	user : 'root',

	/**
	* This componet handles icon upload along with preview and drag drop.
	* Usage: include it as xtype: 'imageuploadfield', including this field in a form requires us to submit it via a method submitWithImage instead of submit.
	*/

	Ext.define('SomeNameSpace.ImageUploadField', {
	alias: 'widget.imageuploadfield',
	extend: 'Ext.form.FieldContainer',

	/**


	function cleanEmptyFoldersRecursively(folder) {
	var fs = require('fs');
	var path = require('path');

	var isDir = fs.statSync(folder).isDirectory();
	if (!isDir) {
	return;
	}
	var files = fs.readdirSync(folder);

	<script>
	// A minimal polyfill for copying text to clipboard that works most of the time in most capable browsers.
	// Note that:
	// - You may not need this. `navigator.clipboard.writeText()` works directly in all modern browsers as of 2020.
	// - In Edge, this may call `resolve()` even if copying failed.
	// - In Safari, this may fail if there is nothing selected on the page.
	// See https://github.com/lgarron/clipboard-polyfill for a more robust solution.
	//
	// License for this Gist: public domain / Unlicense
	function writeText(str) {