fuwiak

{
  "lastUpdateDate": "27/08/2019",
  "sections": [
    {
      "name": "Sekcja past",
      "link": "https://facebook.com/groups/1607563912830342",
      "members": 69942,
      "category": "Humor"
    },
    {

fuwiak

{
  "lastUpdateDate": "27/08/2019",
  "sections": [
    {
      "name": "Sekcja past",
      "link": "https://facebook.com/groups/1607563912830342",
      "members": 69942,
      "category": "Humor"
    },
    {

fuwiak

Table Of Content

Skip to the relevant sections if needed.

• 2-min tutorial to do it the quick-and-dirty-way
• Concepts for resolving Git conflicts
• Setting up different editors / tool for using git mergetool
  • Finding out what mergetool editors are supported
• mergetool simple code example for vimdiff
  • Resolving conflict from a Git pull
• Other great references and tutorials

fuwiak

git cheat-sheet

The git command-line utility has plenty of inconsistencies http://steveko.wordpress.com/2012/02/24/10-things-i-hate-about-git/

A GUI like http://sourcetreeapp.com is often helpful, but staying on the command line usually quicker. This is a list of the commands I use most frequently, listed by functional category:

current state

git status list which (unstaged) files have changed