This practical course will demystify some very useful operations with git, give you some good habits that set you up for success, and prepare you for solving complex problems.

With the power of examples, stories, and exercises you will learn about and get experience with topics and features like:

* The art of good commits
* Effective git log: search, queries, diffs
* Making use of the staging area
* Mastering merges: conflict resolution and octopuses
* Composition with cherry-picks, fixups, and rebase
* Frequent snapshots and rollbacks
* Bisecting for bugs: time travel for the cause
* Recovering not-yet-lost changes
* Transports, patches, and emails

After the course you will have a renewed appreciation for what git can do for you, and a stronger foundation to build on when maintaining your programs.




Your favourite git client and programming environment.

There is no substitute for real world examples; you can bring your own code base, or a favourite open-source one, to play with. This is fun, but optional; plenty of good examples will be provided.




Some basic exposure to git, or at least some of version control system, is necessary as some core concepts will not necessarily be carefully explored.

Version control, which today is almost synonymous with git, is a centrepiecein the programmer toolkit. It is everywhere, from small solo projects, to infrastructure, to massive code bases with thousands of contributors. Unfortunately, it is often only used as a fast copy-and-sync interface to the shared code base, and many powerful features are left unused. Git is an amazing tool, but it can be daunting, and getting beyond the basics is hard. Thankfully, there is a payoff, and being more familiar with git will supercharge you.

ABAX is the fastest growing SaaS company in Europe with HQ in Larvik, Norway. We develop software and hardware for the connected workspace bringing asset and vehicle tracking into the future. Our developers have built one, fully integrated software platform scalable for all future innovation services. All our hardware, and software are “plug and play” making it easy for our clients to become more efficient and eco-friendly. At ABAX there are 300 employees divided between sales, customer care, marketing, support, administration, quality and development with multiple nationalities in a great tech environment. We are happy sponsors of NDC and looking forward to see you next year, meanwhile you can join the adventure!

Abax

Abstractions

Apotek1

For over 12 years, Amazon Web Services has been the world’s most comprehensive and broadly adopted cloud platform. AWS offers over 165 fully featured services for compute, storage, databases, networking, analytics, robotics, machine learning and artificial intelligence (AI), Internet of Things (IoT), mobile, security, hybrid, virtual and augmented reality (VR and AR), media, and application development, deployment, and management from 60 Availability Zones (AZs) within 20 geographic regions, spanning the U.S., Australia, Brazil, Canada, China, France, Germany, India, Ireland, Japan, Korea, Singapore, Sweden, and the UK. AWS services are trusted by millions of active customers around the world—including the fastest-growing startups, largest enterprises, and leading government agencies—to power their infrastructure, make them more agile, and lower costs. To learn more about AWS, visit aws.amazon.com.

Bouvet

A global leader in consulting, technology services and digital transformation, Capgemini is at the forefront of innovation to address the entire breadth of clients’ opportunities in the evolving world of cloud, digital and platforms. Building on its strong 50-year heritage and deep industry-specific expertise, Capgemini enables organizations to realize their business ambitions through an array of services from strategy to operations. Capgemini is driven by the conviction that the business value of technology comes from and through people. It is a multicultural company of 200,000 team members in over 40 countries. The Group reported 2017 global revenues of EUR 12.8 billion.

Capgemini

DevExpress

Dfind

Dips

Elastic

Element Logic

We use our competence and technology to provide energy to a growing population in a responsible manner. This guides us as we work towards a future where energy is affordable and sustainable for all.

Equinor

Geodata

Infragistics

With offices in Oslo, Bryne, Stockholm, Copenhagen, Kiev and Bratislava, Itera is delivering innovative solutions and services to Nordic and international businesses with local presence in the Nordic region. The Nordics has a highly educated mobile workforce, with many innovative businesses and organizations. Itera has worked in the region for over 15 years.

itera

At JetBrains, code is our passion. For over 15 years we have strived to make the strongest, most effective developer tools on earth. By automating routine checks and corrections, our tools speed up production, freeing developers to grow, discover and create.

Jetbrains

Knowit is a consultancy firm that creates unique customer value in a world of accelerating digitization, by offering international solutions in three divisions – Experience, Insight and Solutions. What sets us apart is our ability to combine expertise in design and communication, management consulting and IT.

Knowit

Launch Darkly

Miles

Netcompany

norkart

nova

Particular

Progress

Sentry

Systek

Text Control

tietoevry

Tina CMS

twoday

TWSH

Vipps

Vitec

Webstep

Xlent

NDC Oslo 2024

Oslo Spektrum

Bloomberg Engineering


Cisco
Cisco helps seize the opportunities of tomorrow by proving that amazing things can happen when you connect the unconnected. And, as a part of the Cisco portfolio, Webex Rooms connects people to productivity rather than getting in the way of it by promoting the ability for them to work where they want, when they want, and how they want to get stuff done. The world works better face to face, and whether there is a need to work remote or in-person, Webex Rooms delivers the collaboration tools for that authentic interaction. We are proud to have one of the largest R&D sites in Norway with over 400 employees, developing and designing collaboration tools!

Cisco Webex

Kongsberg

NDC TechTown 2024

Magazinet Kongsberg

Jørgen is a programmer and has mainly been writing free software in his career - lately targeting gcc. He left the energy industry for work on compiler toolchains and build systems in Japan, before returning to his native Norway where he is currently programmer & director at patch. Now he solves hard and interesting problems where he can find them, does bespoke programming as well as teaching, training, and consulting. He holds an MSc in Computer Science from NTNU.

Git Beyond Push & Pull