git and xcode - nsspain2013

Git and XCodeAlfonso Alba@aprendegit

martes, 17 de septiembre de 13

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 find 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 files

• 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 conflics 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 files 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

baboonhttps://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-filehttp://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

• Enterprise tools

• Github Enterprise

• Stash

• Sourceforge

• PlasticSCM

One more thing...

Git is not a backup system

Thank you!!

info@aprendegit.comhttp://www.aprendegit.com

@aprendegit

@aalbagarcia

git and xcode - nsspain2013

code martes

merging martes

locking martes

tools martes

aprendegit martes

problem martes

c martes

comseyzbaboon martes

Technology

git for hackathons - kevinchen.co · download git os x...

xcode server & xcode 7 bots

introducing xcode source control -...

xcode magazine 3

xcode, basics and beyond

xcode workspace

g xcode 6 tips and tricks - raywenderlich.com€¦ · g...

using xcode

introduction of xcode

git basics for everyone...git installation macbook: if xcode...

xcode magazine 14

beginning xcode - link.springer.com

xcode magazine 20

today -topics about teamwork - washington university in st...

xcode kit - apple.com · same tools, techniques, and...

open xcode

understanding source control in xcode · git remotes....

•what’s new in signing for xcode and xcode...

resolving xcode git merge conflict

xcode templates