A little about me...

That's my family!

Zoni

(29 a few times)

Zander (14)

Lauralynn
(11)

Owen (15.9)

Jason
(Dirt)

*DF (i.e. ADF, SDF, CDF, WTFDF) files are just XML code.

Multiple Content Engineers are touching these files.

There's no real history for these files, so if a change that was made last year needs to be reverted...

Stash Hierarchy

Projects

Repositories (Repos)

Branches/Tags

Commits

Code

Local

Most of your work is actually done locally. commit is local. checkout is usually local. merge is done locally. You pull     from remote to local.

Remote

Remote is the "golden" copy of the code. About the only thing you do with remote is push  your local work to it. (OK, and fetch     is used to pull remote branches, but you don't use it often.)

commit

checkout

merge

pull

push

fetch

Near

Far

• git config [scope] [commands]

git config --global editor.core atom

git config --global alias.ec config --global --edit

git config --global alias.co "checkout"
git config --global alias.cob "checkout -b"
git config --global alias.cm "!git add -A && git commit -m"
git config --global alias.masterpull "!git co master && git pull"

Other Editors | Windows

git fetch

Fetches all of the branches available on the remote host

git checkout [branchname]

"Checks out" the branch indicated. Note that this will use local first, and then (if not found locally) attempt to checkout from the remote host

git pull

Creates a new local branch with the name indicated

git co [branchname]

git cob [branchname]

"Pulls" the code from the remote server for the branch you're currently in

git checkout -b [branchname]

git reset --hard HEAD

Resets your current branch to the HEAD commit of the current branch. Basically, it's your ultimate Undo button.

git add [files to add] 

Adds the list of files provided to the local repository. Use -A to include all modified files.

git commit -M "Message here"

Commits all changes made (since last commit) to the local repository.

git cm "Message here"

Does both of the above with one step. (Aliases ROCK!)

git push

git push --set-upstream origin [branchname]

"Pushes" the code from the local repository for the branch you're currently in to the remote repository (The second command is required after creating a new local branch when pushing for the first time)

git stash

"Stashes" all modifications in a local cache.  (FIFO)

git stash apply

Applies changes in the "stash" to the current branch.

git merge [branchName]

Say WHAT?

<item>
    <id>OU812</id>
    <genre>ROCKIN'</genre>
    <artist>Van Hagar</artist>
</item>

<item>
    <id>OU812</id>
    <genre>ROCKIN'</genre>
    <artist>Van Halen</artist>
</item>

Which one is right and which one is dead?

<item>
    <id>OU812</id>
    <genre>ROCKIN'</genre>
    - <artist>Van Halen</artist>
    + <artist>Van Hagar</artist>
</item>

Merge conflicts are often multiple lines in multiple files, and in many cases both sets of changes will be correct.

Which one is right and which one is dead?

Merge

Rebase

will create a new commit to the feature branch which merges the master and featurebranches together.

git merge master feature

git checkout feature
git rebase master

will move the entire feature branch to begin at the tip of the master branch.

Creates a bit messier log/history, but can be used for all merging (public and personal)

Creates a "prettier" log/history, but should NEVER EVER be used on "public" branches, like master.

NEVER EVER NEVER NEVER NEVER EVER on master

Gitflow (recommended, not required)​

Honestly, WAY outside the scope of this session. If you want more information about reverting commits, we should have another session. Hopefully, you won't need to. When you do, find a git guru to help!

Atlassian Revert Tutorial

git revert

git reset