Slide 18
Slide 18 text
Failed to merge
Using index info to reconstruct a base tree...
M Pen/Pineapple/Apple/Pen.storyboard
Falling back to patching base and 3-way merge...
Auto-merging Pen/Pineapple/Apple/Pen.storyboard
CONFLICT (content): Merge conflict in Pen/Pineapple/Apple/Pen.storyboard
error: Failed to merge in the changes.
• ͳΜͱͳͬͯ͘ղܾͰ͖ͯ͠·͏
• ͨͩಉ͜͡ͱ͕ى͖ͯಉ͜͡ͱͰۤ͠Έଓ͚Δ