1. This site uses cookies. By continuing to use this site, you are agreeing to our use of cookies. Learn More.
  2. Dismiss Notice

Quite a bit for you to read!

Discussion in 'Pyra News' started by EvilDragon, Mar 23, 2017.

  1. blazing_grey

    blazing_grey Still Fresh

    Joined:
    Jul 13, 2013
    Messages:
    14
    Git can version binaries just fine, it just can't do a 3-way merge on them.

    Probably. If there's a way, it'll now be revealed.
     
  2. FBnil

    FBnil ¡sɥʇuoɯ oʍʇ uı ɐɹʎԀ

    Joined:
    Dec 14, 2012
    Messages:
    1,958
    Location:
    Yurp
    Ah... and the commit message would say something like: "Checking into the airplane, committing savestate"...
    or "no public wifi here? Doesn't matter... the Pyra can connect directly to the Internet..."
     
    ClockworkCoder likes this.
  3. zmatt

    zmatt Member

    Joined:
    Oct 31, 2015
    Messages:
    70
    Location:
    Netherlands
    You can define custom diff drivers and merge drivers, and use .gitattributes to tell git to use them for certain paths
     
    ible likes this.

Share This Page

Loading...