Git Gone Wild: How to Recover from Common Git Mistakes - Magnus Stahre
"Oh no! I just typed something into git and now my work is gone! Ahh!" Don't panic. Contrary to popular belief, git is one of the most non-destructive version control systems available. When used right, git never loses any data, and even when misused, chances are very high you can still recover. This talk will present turn-by-turn directions on how to recover from a wide array of common git mistakes, and also provide some workflows to minimize them. Examples include, but are not limited to: * Changing spelling errors in commit messages. * Split commits into multiple commits with logical separation. * Combining multiple commits into one. * Resetting the base commit when you accidentally branch off of the wrong branch. * Recovering from merge conflicts. As well as more advanced topics, such as: * Extracting parts (e.g. sub-directory) of a repository as a new repository. * Merging multiple repositories into one while retaining version history. * Removing confidential data accidentally committed.
Copyright © 2016 Stir Trek Conference, Inc.
All rights reserved. No part of this publication may be reproduced, distributed, or transmitted in any form or by any means, including photocopying, recording, or other electronic or mechanical methods, without the prior written permission of the publisher, except in the case of brief quotations embodied in critical reviews and certain other noncommercial uses permitted by copyright law.
