book In partnership with:

Size: px

Start display at page:

Download "book In partnership with:"

Nigel Kelly
6 years ago
Views:

1 TM book In partnership with:

2 1. About SOAL Contents 2. Git Cheat Sheet 3. Git SOS 4. Faster, Less frustrated Debugging

About SOAL School of Accelerated Learning is a parallel education institute aimed to transform our students into agile doers and disruptive thinkers.

3 About SOAL School of Accelerated Learning is a parallel education institute aimed to transform our students into agile doers and disruptive thinkers. With hope to enlighten each student and kindle in them a drive to embrace disruption in a rapidly evolving world, we at SOAL are building learning spaces and tech platforms to nurture a superior tech education ecosystem and professionals in developing economies, starting with India. Our inclusive brick and mortar classrooms, blended with our proprietary learning platform are designed to create software craftsmen, change makers and innovators who can create scalable solutions (services and products) to meet the needs of the Indian ecosystem through their work. 1

4 Git Cheat Sheet Remember! Global configuration is stored in /.gitconfig. master is the default development branch. git <COMMAND> --help git config --help origin is the default upstream repository. Create From existing data cd ~/my.project_directory git init git add. From existing repository git clone ~/existing_repo ~/new/repo git clone git://host.org/project.git git clone Show From changed in working directory git status Changes made to tracked files git diff What changed between ID1 and ID2 git diff<id1> <ID2> History of changes git log History of changes for file with diffs git log.p <FILE> <DIRECTORY> Who changed what and when in a file git blame <FILE> A commit identified by ID git show <ID> A specific file from a specific ID git show <ID>:<FILE> All local branches git branch star (*) marks the current branch Workflow Revert Return to the last commited state git reset --hard This cannot be undone! Revert the last commit git revert HEAD Create a new commit Revert specific commit git revert <ID> Creates a new commit Fix the last commit git commit -a --amend (after editing the broken files) Checkout the ID version of a file git checkout <ID> <FILE> Update Fetch latest changes from origin git fetch (this does not merge them) Pull latest changes from origin git pull (does a fetch followed by a merge) Apply a patch that someone sent you git am -3 patch.mbox In case of conflict, resolve the conflict and git am --resolved Publish Commit all your local changes git commit -a Prepare a patch for other developers git format-patch origin Push changes to origin git rpush Make a version or milestone git tag v1.0 Branch Switch to a branch git checkout <BRANCH> Merge BRANCH1 into BRANCH2 git checkout <BRANCH2> git merge <BRANCH1> Create branch BRANCH based on HEAD git branch <BRANCH> Create branch BRANCH based on OTHER and switch to it git checkout -b <BRANCH> <OTHER> Delete branch BRANCH git branche -d <BRANCH> Resolve merge conflicts View merge conflicts git diff View merge conflicts against base file git diff --base <FILE> View merge conflicts against your changes git diff --ours <FILE> View merge conflicts against other changes git diff --theirs <FILE> Discard a conflicting patch git reset --hard git rebase --skip After resolving conflicts, merge with git add <CONFLICTING_FILE> git rebase --continue CREATE BROWSE CHANGE REVERT UPDATE BRANCH COMMIT PUBLISH init checkout commit push clone branch format-patch status log show diff branch reset checkout revert pull fetch merge am 2

Git SOS So you have a mess on your hands justin hileman http://justinhileman.info/git.pretty/ Yep What sort of mess? An uncommitted mess Do you care enough about your mess to keep it?

5 Git SOS So you have a mess on your hands justin hileman Yep What sort of mess? An uncommitted mess Do you care enough about your mess to keep it? Looks like we caught this just in time Split off a logical chunk from your mess, stage it, and commit it with a good message My Git history is ugly I accidentally committed something Has anyone else seen it? git reset --hard git revert {COMMITISH} Still have a mess?, we re cool now t yet (I do not think it means what you think it means.) Is it already on Github? How long ago? It seems like forever ago Last commit What would make this better? I forgot to add a file A better message git add {myfile} git commit --amend Everything is going to be fine Should we remove merge commits? That would do the trick Just throw the last commit away git reset --hard HEAD^ Is anyone down stream?, I need to change history Take a mulligan? We ll reset and commit from scratch git rebase origin/{branch} git reset {COMMITISH} We re going to do an interactive rebase! Enough to form a lynch mob? Do you hate them? git rebase -i {COMMITISH} DangerZone TM... It s safest to let it stay ugly then Send them a note. let em know you re changing history. git push ==force origin {branch} TM hello@soal.io

6 Faster, Less Frustrating Debugging 1. Debugging as you code The golden rule: execute your program after every 2-3 lines of code. Debug often, a bug at a time. Try not to accumulate errors and fix them all at once. 2. Errors are a blessing Errors are good. Errors are friendly. Development & errors go hand-in-hand. Errors will form the base of your debugging efforts. Read the error to get information on the kind of error and the exact file and line at which the code is failing 3. Treating the disease, not the symptoms Don't search for a problem on Google, stumble on the relevant StackOverflow question right on the first page and copy-paste the code from the top answer without even reading the thing. Understand why your code fails and what is causing it to. Is it a wrongly typed ; in my code or is it a function that you're calling out of scope. Give the error some thought and follow the code to find the root cause. 4. Have someone else read your code Often, when you read your own code, you read it as you meant to write it, not as it's actually written. So it can be hard to catch little things like off-by-one errors. If you take some time away from your code, then read it fresh, or have someone else read it, then often you might find your code doesn't do exactly what you thought it did. A fresh pair of eyes always help 5. Talk to the Computer AKA Rubber Duck Debuggying This might sound crazy but it does work. Try explaining the error to your computer or a rubber duck or any other inanimate object. Explain the error, its likely causes, the flow of the program/code to your computer. Describing what a block of code program should do while observing what it actually does helps your brain figure out any incongruity in them 6. Pseudocode Break down your code into really simple statements. You could even write these as comments next to each line of code. Breaking down code into logical statements will help you catch any discrepancies in the logic and the actual code that you have written 7. When in doubt, Print it out Use your print function to print out the state on every line where it can change. After all, a bug is just an unexpected state in your program, so pinpointing exactly where the state is different than what you expected will help you know where the error lies. 8. Take a Break! Go out, mover your limbs, get some coffee. Just don't think about the error for a bit. This might sound counter intuitive but taking a break and coming back to the problem actually helps you get a fresh perspective on the error. TM hello@soal.io

TM INTRODUCING TECHNOLOGY EXPONENT PROGRAM TEP - Product Engineering is a 14-week immersion that will transform select individuals, who show exemplary aptitude, into future leaders of technology.

7 TM INTRODUCING TECHNOLOGY EXPONENT PROGRAM TEP - Product Engineering is a 14-week immersion that will transform select individuals, who show exemplary aptitude, into future leaders of technology. TECHNICAL EXPERTISE MAKER MINDSET LIFELONG LEARNING INDUSTRY ALIGNMENT Acquire a strategic understanding of programming fundamentals for a constantly evolving tech landscape. Go beyond the basic functional and operational knowledge. Heighten your aptitude with computational mindset required to build world-class products. Develop skills that will keep you relevant in the information age of today and rapidly changing technology world of tomorrow. Get accustomed to industry best practices by learning from, networking, and working with the best in the field. Request to Apply CAREER BACKING Don't get a job. Secure a career. Get hired at your dream company. Secure the best opportunities that the industry has to offer. Work with our career advancement team and the network of partners to jumpstart your professional lifecycle. OUR PARTNERS T-Hub, IIIT-H Campus, Gachibowli, Hyderabad, Telangana India hello@soal.io

Git. all meaningful operations can be expressed in terms of the rebase command. -Linus Torvalds, 2015

Git. all meaningful operations can be expressed in terms of the rebase command. -Linus Torvalds, 2015 Git all meaningful operations can be expressed in terms of the rebase command -Linus Torvalds, 2015 a talk by alum Ross Schlaikjer for the GNU/Linux Users Group Sound familiar? add commit diff init clone