August 2009
Intermediate to advanced
144 pages
2h 35m
German
Content preview from git kurz & gutBecome an O’Reilly member and get unlimited access to this title plus top books and audiobooks from O’Reilly and nearly 200 top publishers, thousands of courses curated by job role, 150+ live events each month,
O’Reilly covers everything we've got, with content to help us build a world-class technology community, upgrade the capabilities and competencies of our teams, and improve overall team performance as well as their engagement.I wanted to learn C and C++, but it didn't click for me until I picked up an O'Reilly book. When I went on the O’Reilly platform, I was astonished to find all the books there, plus live events and sandboxes so you could play around with the technology.I’ve been on the O’Reilly platform for more than eight years. I use a couple of learning platforms, but I'm on O'Reilly more than anybody else. When you're there, you start learning. I'm never disappointed.I'm always learning. So when I got on to O'Reilly, I was like a kid in a candy store. There are playlists. There are answers. There's on-demand training. It's worth its weight in gold, in terms of what it allows me to do.
Konfliktmanagement
Kommen wir nun zu den unangenehmen Aspekten der Teamentwicklung: Konflikten.[6]
Merge-Konflikte
Betrachten wir zunächst Konflikte, die bei einem Merge auftreten können. Git gibt Ihnen nach einem Merge an, ob und in welchen Dateien es zu nicht automatisch behebbaren Konflikten gekommen ist. Innerhalb der Dateien werden die nicht zueinander passenden Stellen, wie schon von Subversion bekannt, mit >>>>>, ===== und <<<<< gekennzeichnet. Dabei ist der Abschnitt zwischen >>>>> und ===== Ihre lokale Version, und der Abschnitt zwischen ===== und <<<<< ist der Teil, der mithilfe des Merge eingearbeitet werden soll. An diesen Stellen müssen Sie selbst Hand anlegen und den Konflikt beheben. Vergessen Sie dabei nicht, auch die Konfliktmarkierungen ...
Become an O’Reilly member and get unlimited access to this title plus top books and audiobooks from O’Reilly and nearly 200 top publishers, thousands of courses curated by job role, 150+ live events each month,
and much more.
Read now
Unlock full access
More than 5,000 organizations count on O’Reilly
O’Reilly covers everything we've got, with content to help us build a world-class technology community, upgrade the capabilities and competencies of our teams, and improve overall team performance as well as their engagement.Julian F.
I wanted to learn C and C++, but it didn't click for me until I picked up an O'Reilly book. When I went on the O’Reilly platform, I was astonished to find all the books there, plus live events and sandboxes so you could play around with the technology.Addison B.
I’ve been on the O’Reilly platform for more than eight years. I use a couple of learning platforms, but I'm on O'Reilly more than anybody else. When you're there, you start learning. I'm never disappointed.Amir M.
I'm always learning. So when I got on to O'Reilly, I was like a kid in a candy store. There are playlists. There are answers. There's on-demand training. It's worth its weight in gold, in terms of what it allows me to do.