Jump to content

[INFO] GIT commands


Recommended Posts

  • 6 months later...
  • 5 months later...
  • 2 weeks later...

Please Add more commnad that we need on special cases like conflicts, how to resolve them etc

Use patch command under linux/win and find blocks in ur code (with npp or other editor):

<<<<<<< HEAD

								 uiDeathArmyCheckTimer = 0;

								 bDeathArmyDone = true;


								 if (uiDeathArmyCheckTimer <= uiDiff)


									 me->ClearUnitState(UNIT_STATE_ROOT | UNIT_STATE_STUNNED);

									 uiDeathArmyCheckTimer = 0;

									 bDeathArmyDone = true;

								 } else uiDeathArmyCheckTimer -= uiDiff;

>>>>>>> 84268be882e79ee7633323502ce83f2e4bfcf3a9

all between <<<<<<< HEAD and ======= - is what u have now in code, between ======= and >>>>>>> [hash] - what u want to have, after apply patch or smth. Check logic, functions, variables, etc and try to fix ur code. There is no step-by-step guide "how to fix conflicts after applyin patch".

  • Upvote 1
Link to comment
Share on other sites

  • 1 month later...
  • 2 months later...
  • 4 weeks later...
  • 7 months later...
  • 1 year later...

For those who want to have quick start with GIT:


GitHub Cheat Sheet

All the hidden and not hidden features of Git and GitHub. This cheat sheet was inspired by Zach Holman's Git and GitHub Secrets talk at Aloha Ruby Conference 2012 (slides) and his More Git and GitHub Secrets talk at WDCNZ 2013 (slides).


Link: https://github.com/tiimgreen/github-cheat-sheet

  • Upvote 1
Link to comment
Share on other sites

Join the conversation

You can post now and register later. If you have an account, sign in now to post with your account.

Reply to this topic...

×   Pasted as rich text.   Paste as plain text instead

  Only 75 emoji are allowed.

×   Your link has been automatically embedded.   Display as a link instead

×   Your previous content has been restored.   Clear editor

×   You cannot paste images directly. Upload or insert images from URL.


  • Recently Browsing   0 members

    No registered users viewing this page.

  • Create New...