To alleviate the occurrence of conflicts developers will work in separate isolated branches

A merge will fail to start when Git sees there are changes in either the working directory or staging area of the current project

Merge commits are unique against other commits in the fact that they have two parent commits

However, a fast-forward merge is not possible if the branches have diverged

downloads commits, files, and refs from a remote repository into your local repo

Git isolates fetched content from existing local content; it has absolutely no effect on your local development work.

safe way to review commits before integrating them with your local repository.

Remote connections are more like bookmarks rather than direct links into other repositories.

Git checkout is an easy way to “load” any of these saved snapshots onto your development machine

when you check out a previous commit, HEAD no longer points to a branch—it points directly to a commit

Doing a reset is great for local changes however it adds complications when working with a shared remote repository

Self-attention is a sequence-to-sequence operation

The dot product expresses how related two vectors in the input sequence are

Self attention sees its input as a set, not a sequence

Ignored files are usually build artifacts and machine generated files that can be derived from your repository source or should otherwise not be committed

The git stash command takes your uncommitted changes (both staged and unstaged), saves them away for later use, and then reverts them from your working copy

Alternatively, you can reapply the changes to your working copy and keep them in your stash with git stash apply:

ou can reapply previously stashed changes with git stash pop:

The two dots in this example indicate the diff input is the tips of both branches. The same effect happens if the dots are omitted and a space is used between the branches

It changes branch1 into a ref of the shared common ancestor commit between the two diff inputs, the shared ancestor of branch1 and other-feature-branch.