Skip to content

Latest commit

 

History

1 Commit

Folders and files

NameName
Last commit message
Last commit date
 
 
 
 

Repository files navigation

Conflict Practice Repo

Now with a first-month-free promo. See pricing.md.

Clone this, then try:

  1. git fetch origin
  2. git checkout feature/pricing
  3. git rebase main (or git merge main)
  4. Resolve the conflicts in pricing.md and README.md
  5. Continue the rebase / commit the merge
  6. git push --force-with-lease (only after rebase, on your own branch)

About

Demo for Git Workshop 11/10/26

Resources

Code of conduct

Contributing

Stars

0 stars

Watchers

0 watching

Forks

Releases

Packages

Contributors