CODEWITHSUNDEEP
gitgithub
azamsharp
azamsharp

Reputation: 20086

Git Shows head in the code and not my changes

I just pushed some code on Github and now I see the following in my code: 

// HelloWorld Layer
@interface GameScene : CCLayer
{

    CCSprite *devil;
    CCParticleFire *fireball; 
    CollisionManager *collisionManager;
    Demon *demon; 
    Spaceship *spaceship;
    Scoreboard *scoreboard;
    Environment *env;
    int lives; 
<<<<<<< HEAD
=======
    CGSize windowSize; 
>>>>>>> 37190b1e49c75517ce26e1040aaaed12bd2a013c

What is going on here?

Upvotes: 2

Views: 1982

Answers (1)

Adam Byrtek
Adam Byrtek

Reputation: 12202

This is a merge conflict which probably happened after you pulled some changes. You should have resolved the conflict before commiting by editing the area inside the markers and removing them. Feel free to read more about merging and conflict resolution in the Git Book.

Upvotes: 5

Related Questions