Light

llfuller / conversion_tofix Goto Github PK

View Code? Open in Web Editor NEW

This project forked from zonca/conversion_tofix

0.0 0.0 0.0 13 KB

Exercise for Advanced git tutorial

License: The Unlicense

Python 100.00%

conversion_tofix's Introduction

conversion_tofix

1) Make a test

Clone this repository to Comet
Test it running python test_conversion.py, does it fail?
Checkout the code version just before the last commit, does it still fail? How do you go back to the last commit?

2) Bisect

Identify the commit causing the bug with git bisect, see https://git-scm.com/docs/git-bisect

3) Fix in branch

Create a new branch fix_bug
Undo it with git revert https://git-scm.com/docs/git-revert

4) Create Pull Request

Try to push it back to the original repository with git push origin fix_bug, does it work?
Fork the repository under your Github account through the Github website
Rename the origin remote to upstream https://help.github.com/articles/renaming-a-remote/
Add your fork of the repository as a remote to the repository on Comet
git push your fix_bug to your repository
Go to https://github.com/zonca/conversion_tofix, create a Pull Request!

5) Synchronize upstream

I will create a new commit in my repository
Create 2 branches, test rebase in one and merge in the other
After merge, inspect with git log --graph --oneline

6) Synchronize upstream with conflicts

I will create a new commit in my repository with a conflict
Do a rebase and handle conflicts

7) Erase commit

Use git rebase to completely wipe the commit from history
Try to push

8) Hard reset

Wipe the last commit with git reset --hard

conversion_tofix's People

Contributors

Recommend Projects

React

A declarative, efficient, and flexible JavaScript library for building user interfaces.
Vue.js

🖖 Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.
Typescript

TypeScript is a superset of JavaScript that compiles to clean JavaScript output.
TensorFlow

An Open Source Machine Learning Framework for Everyone
Django

The Web framework for perfectionists with deadlines.
Laravel

A PHP framework for web artisans
D3

Bring data to life with SVG, Canvas and HTML. 📊📈🎉

Recommend Topics

javascript

JavaScript (JS) is a lightweight interpreted programming language with first-class functions.
web

Some thing interesting about web. New door for the world.
server

A server is a program made to process requests and deliver data to clients.
Machine learning

Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.
Visualization

Some thing interesting about visualization, use data art
Game

Some thing interesting about game, make everyone happy.

Recommend Org

Facebook

We are working to build community through open source technology. NB: members must have two-factor auth.
Microsoft

Open source projects and samples from Microsoft.
Google

Google ❤️ Open Source for everyone.
Alibaba

Alibaba Open Source for everyone
D3

Data-Driven Documents codes.
Tencent

China tencent open source team.