Mastering Git - Part 1: Implementation of Git | Ray Wenderlich

🎓 Courses & Articles
1

If you've been using Git for a while, you might be wondering how it actually works. In the first video of the Mastering Git video course, you'll discover how Git is built on top of a simple key-value store-based file system, and what power this provides to you.

This is a companion discussion topic for the original entry at https://www.raywenderlich.com/4289-mastering-git/lessons/1
2

The 10 and 11 in the magic square row 2 need to de swapped, otherwise the diagonals and the second and third columns don’t add up to 34.

3

Well spotted @marathoner1234—apologies for the typo!

Thanks

sam

4

Nice tutorial Sam!!, Do you have any plan to upload video about Gated CheckIn ?

5

Thanks @mdzinuk—I’m glad you enjoyed it.

There are currently no plans to add a tutorial on that, no. GitHub has recently launched some new features that support restrictions on things like merges and pushing. That might be what you’re looking for.

git itself has functionality to run scripts at different points using git-hooks—you could use these to ensure that commits pass some arbitrary tests.

Hope that helps

sam

6

How to dealing merge conflict with xcodeproj?

Any tips?

Thank you

7

Hi @yoshiboarder

xcodeproj are frustratingly difficult to resolve conflicts in. In my experience there are only really 2 approaches (same for storyboards):

  1. Since xcodeproj is just XML, if a conflict is simple, you can resolve it by opening it in a text editor, locating the conflicts and fixing them manually.
  2. Choose one of the versions—usually the “before”, and then zip through Xcode recreating the changes.

It all depends on the scenario. (2) can be irritating, but is sometimes the only real way to properly resolve the issues. If commits are kept small, it’s often not too challenging to resolve these issues.

sam

1 Like