background preloader

Version Control

Facebook Twitter

Try Git. Git - the simple guide. Git - the simple guide just a simple guide for getting started with git. no deep shit ;) by Roger Dudler credits to @tfnico, @fhd and Namics this guide in deutsch, español, français, indonesian, italiano, nederlands, polski, português, русский, türkçe, မြန်မာ, 日本語, 中文, 한국어 Vietnamese please report issues on github Drive deeper customer connections with Mailchimp's marketing CRM.ads via Carbon setup.

git - the simple guide

A Holiday Analogy About How Git Works. A Quick Introduction to Version Control with Git and GitHub. Citation: Blischak JD, Davenport ER, Wilson G (2016) A Quick Introduction to Version Control with Git and GitHub.

A Quick Introduction to Version Control with Git and GitHub

PLoS Comput Biol 12(1): e1004668. Editor: Francis Ouellette, Ontario Institute for Cancer Research, CANADA Published: January 19, 2016 Copyright: © 2016 Blischak et al. This is an open access article distributed under the terms of the Creative Commons Attribution License, which permits unrestricted use, distribution, and reproduction in any medium, provided the original author and source are credited Funding: JDB is supported by National Institutes of Health grant AI087658 awarded to Yoav Gilad.

Competing interests: The authors have declared that no competing interests exist. “This is part of the PLOS Computational Biology Education collection.” Pro Git. Generating SSH Keys. SSH keys are a way to identify trusted computers, without involving passwords.

Generating SSH Keys

The steps below will walk you through generating an SSH key and adding the public key to your GitHub account. We recommend that you regularly review your SSH keys list and revoke any that haven't been used in a while. Tip: GitHub has a desktop client! You can use it without ever touching the command line. The Second Pull Request Could be (Much) Better. When considering pull requests on Github, we need to keep in mind that even if someone’s first pull request is not 100% perfect, his/her second one could be much better (if he/she is willing to continue the contribution).

The Second Pull Request Could be (Much) Better

I have observed this phenomenon several times, and that is one of the reasons why I want to carefully review and help with people’s first pull requests. I’m looking at the future, instead of only the current pull request. A fresh example is Leonardo Collado-Torres’s recent (and the second) pull request to the blogdown package, in which he brought a very useful RStudio addin that makes it really neat to upload and insert images to your blog posts: This is useful because it saves users from the headache of understanding the special static/ directory in the Hugo system. You just upload your image, and this addin will copy it to the right place and insert the right Markdown or HTML code in your post. Gitignore - Unignore subdirectories of ignored directories in Git. Git Revert "revert is not possible because you have unmerged files"

How to resolve merge conflicts in Git. Git: after resolving the conflicts, mark the corrected paths. Git - Undoing changes. This tutorial provides all of the necessary skills to work with previous revisions of a software project.

Git - Undoing changes

First, it shows you how to explore old commits, then it explains the difference between reverting public commits in the project history vs. resetting unpublished changes on your local machine. git checkout The git checkout command serves three distinct functions: checking out files, checking out commits, and checking out branches. In this module, we’re only concerned with the first two configurations. Checking out a commit makes the entire working directory match that commit. Usage. Git - pull/push from multiple remote locations. Newbie's Guide to Making A Pull Request (for an R package) Having only ever worked with my own packages/repos before, I found this was to be perfect opportunity to “get my feet wet”!

Newbie's Guide to Making A Pull Request (for an R package)

A “Minimal”, Step-by-Step Breakdown of the Process To the reader who is interested in nothing else other than the “minimum” set of “required” steps of making a pull request , I’ve outlined the steps that I took below (with additional commentary provided afterwards and/or with footnotes). I use double brackets {{/}} to indicate names/variables that should be filled in by you for your particular use case. More specifically, There are a couple of extra/alternative things you should consider doing in this process (although these are completely optional). After cd‘ing into the repo, a good “sanity check” to perform is a git remote -v to verify that you are on (master) branch of the forked repo. Then, you could run this command again after the git remote add upstream command and verify that you see the following.

Git Forks and Upstreams: How-to and a cool tip. Git - Clean up a fork and restart it from the upstream. Git-rebase Documentation. Rebasing interactively means that you have a chance to edit the commits which are rebased.

git-rebase Documentation

You can reorder the commits, and you can remove them (weeding out bad or otherwise unwanted patches). The interactive mode is meant for this type of workflow: have a wonderful ideahack on the codeprepare a series for submissionsubmit where point 2. consists of several instances of finish something worthy of a commitcommit realize that something does not workfix thatcommit it Sometimes the thing fixed in b.2. cannot be amended to the not-quite perfect commit it fixes, because that commit is buried deeply in a patch series.

Git - How can I merge two commits into one if I already started rebase? Kindly Closing Pull Requests. Getting your first pull request from an outside contributor on GitHub is an exciting experience.

Kindly Closing Pull Requests

Someone cared enough about the problem you were solving to check it out themselves, change something, and contribute that change back to your project. When your project has a relatively small number of high-quality, desirable incoming pull requests it is easy to happily merge them. Where things can become more difficult is when your project becomes more notable and the quality, desirability, or number of pull requests you receive causes difficulties. Now the positive feeling you had about the time people spent can be reversed; you don’t want to reject someone’s work when they have already spent the time to get it included. Probot. Automatically close stale Issues and Pull Requests that tend to accumulate during a project.

Probot

How it works After a period of inactivity, a label will be applied to mark an issue as stale, and optionally a comment will be posted to notify contributors that the Issue or Pull Request will be closed.If the Issue or Pull Request is updated, or anyone comments, then the stale label is removed and nothing further is done until it becomes stale again.If no more activity occurs, the Issue or Pull Request will be automatically closed with an optional comment.

Installation After installing the app, create .github/stale.yml in the default branch to enable it: