Skip to content

Conversation

@craigjbass
Copy link
Member

No description provided.

@craigjbass craigjbass force-pushed the git-additional-skill branch from c85fede to bf816c1 Compare August 13, 2018 15:32
* Demonstrate setting the default upstream branch for a local branch
* Demonstrate force pushing rebases into isolated upstream Pull Request branches

## GitHub
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I couldn't think of anything else of interest on here. Maybe commenting?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Demonstrate appropriate rebasing of isolated branches assuming this means rebasing/squashing commit history?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yea

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't merge a branch with 50 commits

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Words to live by.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Perhaps something around PR etiquette, but I don't really have anything to add. LGTM!

@craigjbass
Copy link
Member Author

Git ignore missing

@craigjbass
Copy link
Member Author

Identifying files to ignore

@craigjbass
Copy link
Member Author

Etiquette around getting reviews / useful practices around leaving reviews

@craigjbass
Copy link
Member Author

Ensure all commits pass tests

@StevenLeighton21
Copy link
Contributor

Seems more etiquette, not using git. Useful to know, but not core git?

Copy link
Contributor

@StevenLeighton21 StevenLeighton21 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

General approval from me.

## Initializing

* Demonstrate initializing a new git repository
* Demonstrate creating an empty root commit
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Had not thought about doing this, nice.

* Demonstrate usage of `git status`
* Demonstrate staging files for commit
* Demonstrate committing staged files
* Demonstrate committing a subset of changed files using staged and unstaged files
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How about staging only a subset of a file?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah I don’t do this

* Demonstrate doing a simple rebase of master onto a branch
* Demonstrate performing an amend to previous commit
* Demonstrate performing an interactive rebase of a branch
* Demonstrate using all possible rebase options
Copy link
Member

@adrianclay adrianclay Aug 13, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure what I’d be assessing here.

Scrap that I understand now, all the interactive rebase options.

@adrianclay
Copy link
Member

Needs something about what a good commit message looks like.

@craigjbass
Copy link
Member Author

Going to merge and address commit messages in upcoming

@craigjbass craigjbass merged commit 04d8481 into master Aug 15, 2018
@craigjbass craigjbass deleted the git-additional-skill branch August 15, 2018 10:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants