• Just a reminder that providing specifics on, sharing links to, or naming websites where ROMs can be accessed is against the rules. If your post has any of this information it will be removed.
  • Ever thought it'd be cool to have your art, writing, or challenge runs featured on PokéCommunity? Click here for info - we'd love to spotlight your work!
  • Our weekly protagonist poll is now up! Vote for your favorite Trading Card Game 2 protagonist in the poll by clicking here.
  • Welcome to PokéCommunity! Register now and join one of the best fan communities on the 'net to talk Pokémon and more! We are not affiliated with The Pokémon Company or Nintendo.
    Register

[Other] How does the Merge feature work and how powerful is it?

SuperSpyroDragon64

    • 428
    Posts
    5
    Years
    Does this Merge feature mean there could be a game jam where everyone spends a set amount of time making their own island, and then all the best contest-winning islands are merged together into one big game about travelling from island to island looking for Pokemon to catch and baddies to fight?
     
    SuperSpyroDragon64 said:
    Does this Merge feature mean there could be a game jam where everyone spends a set amount of time making their own island, and then all the best contest-winning islands are merged together into one big game about travelling from island to island looking for Pokemon to catch and baddies to fight?
    Click to expand...
    Assuming that you're talking about Git's merging capabilities, it's functionality that allows you to incorporate someone else's code into your own project.
    That code could contradict or clash with the code that you have in your own project.
    When this happens, a merge conflict is spawned.
    I talk about this a bit more in depth here: https://www.pokecommunity.com/threads/432321
     
    You must log in or register to reply here.
    Back
    Top