Permalink
Browse files

resets + group lab

Signed-off-by: Axylos <robertdraketalley@gmail.com>
  • Loading branch information...
Axylos
Axylos committed Nov 13, 2017
1 parent 48918eb commit 879c1cc9e16a4c9f7f55936fb485c07acf2a547a
Showing with 17 additions and 9 deletions.
  1. +16 −8 README.md
  2. +1 −1 group_lab/README.md
@@ -165,13 +165,6 @@ Automatic merge failed; fix conflicts and then commit the result.
### (You Do) Local Conflict Resolution ### (You Do) Local Conflict Resolution
Go [here](local_lab.md) and follow the instructions Go [here](local_lab.md) and follow the instructions


- Init a new repository
- Make an `init` commit before making any changes
- Add a file `index.js` with very skeletal html, i.e., just an opening and closing `html` tag, `head`, and `body`
- Commit
- Create a new repo on github
- Add remote origin to your local repo
- Push to origin


## Merging and rebasing branches ## Merging and rebasing branches


@@ -199,10 +192,25 @@ Technically, `git pull` is a shorthand for `git fetch origin HEAD` together with


Now I'll make a small repo and accept a PR from someone else before pulling down the changes locally. Now I'll make a small repo and accept a PR from someone else before pulling down the changes locally.


[Creating a PR from a branch](https://help.github.com/articles/creating-a-pull-request/)

[Appriving/Merging a PR](https://help.github.com/articles/merging-a-pull-request/)

These may prove helpful in the following exercise

## (You Do): Group Gitting ## (You Do): Group Gitting
It's Go Time: [Git 'r Done](group_lab) It's Go Time: [Git 'r Done](group_lab)


What story could we tell in light of the data model described above? What commands could we use to inspect the work we've done so far?
## Resets (Resources)
`git reset` can be used to undo committed history and place the changes back either into the staging area `--soft` or in the working directory `--mixed` or discard them entirely `--hard`. Be very careful with `git reset` especially with the `--hard` option since this is potentially destructive.

If you undo public history you will have to `git push --force` after making the changes.

[How to Reset (almost) anything](https://github.com/blog/2019-how-to-undo-almost-anything-with-git)

[Reset, Checkout, Revert](https://www.atlassian.com/git/tutorials/resetting-checking-out-and-reverting)





## Extra Resources ## Extra Resources
@@ -13,7 +13,7 @@ All of your work will happen in your new repo. You are **not** making any PRs t


### Creating new branches ### Creating new branches


For the following steps please pick **one** team member's repo and do all the work there. The purpose of this exercise is to work with git/github as a team. For the following steps please pick **one** team member's repo and do all the work there. The purpose of this exercise is to work with git/github as a team. You can either all clone from one member's repo in a separate directory or adjust the remote origin url with `set-url` like from above.


Make sure at least one person reviews each PR. Make sure at least one person reviews each PR.


0 comments on commit 879c1cc

Please sign in to comment.