Git and XCode - Nsspain2013

Git and XCode
Alfonso Alba
@aprendegit
martes, 17 de septiembre de 13

How?

Minimum man-hour

• If you commit often:
• Your commits will be smaller
• Your history will be more readable
• It will be easier to cherry-pick or revert

Commit often
XCode 4 XCode 5
ALT-CMD-C

• If you do not write good commit messages

Write good commit
messages
XCode 4 XCode 5
You cannot commit empty messages

• If you commit only related changes
• Your history will be more readable
• It will be easier to ﬁnd bugs
• It will be easier to cherry-pick or revert

Commit related
changes
You cannot commit chunks
XCode 4 XCode 5

• If you use branches
• It will cost you less effort to switch
context
• It will be easier to do code review
• You will try new things more often
• It will be easier to refactor

Use branches
Have you ever tried to change a branch in XCode?
XCode 4 XCode 5

THE Problem:
Merging

“My” experience with
git is:

• You will have problems with
• xcuserdata
• xcworspacedata
• Core Data Models
• .xib ﬁles
• Story Boards
• Assets

How to
deal with / mitigate
THE problem

• xcuserdata
• Do not include this file in your
rempository
• Use a good .gitignore file
• http://stackoverflow.com/questions/
49478/git-ignore-file-for-xcode-projects

• xcworkspacedata
• ... you will have to resolve conﬂics
manually

• Core Data Models
• Create the models on code
(Daniel Eggert contribution)
• Use migrations
•Test your models
• Sessions and Workshops during the
conference!!

• XIB and Story Boards
• ... well, if it was easy our life would be
much boring!!

Do not use xib ﬁles or story
boards:
Yes, you will have to write code

This is my code, don’t you dare touch it!!

• If you want to use Interface Builder
• Split the story boards
• Use xib files instead of story boards
• Agree on a workflow and/or protocol
• Good team comunication
• Use file locking (subversion)
• git checkout --theirs / git checkout --ours

DEMO:
git checkout-index

baboon
https://github.com/SeyZ/baboon

baboon
baboon client
working copy
baboon client
working copy
bare repo

Other tools

• git
• Interactive staging
• git-bisect
• git filter-branch / BGF repo cleaner (http://rtyley.github.io/bfg-repo-
cleaner/)
• Hooks
• Incremental merging:
http://softwareswirl.blogspot.nl/2013/05/git-incremental-merge.html
• sort-Xcode-project-file
http://danieltull.co.uk/blog/2013/09/05/easier-merging-of-xcode-project-
files/
(Chris Eidhof contribution)
• SemanticMerge http://www.semanticmerge.com/

Is git your tool?

• Git is not perfect
• BAD for binary files
• No folders
• Guess file renaming
• Too flexible
• Steep learning curve
• No file locking

Access Control

No history rewrites

Undo

• Enterprise tools
• Github Enterprise
• Stash
• Sourceforge
• PlasticSCM

One more thing...

Git is not a backup
system

Thank you!!

info@aprendegit.com
http://www.aprendegit.com
@aprendegit
@aalbagarcia

Git and XCode - Nsspain2013

Empfohlen

Empfohlen

Weitere ähnliche Inhalte

Ähnlich wie Git and XCode - Nsspain2013

Ähnlich wie Git and XCode - Nsspain2013 (20)

Kürzlich hochgeladen

Kürzlich hochgeladen (20)

Git and XCode - Nsspain2013