Jump to content
TrinityCore
killradio_1337

[INFO] GIT commands

Recommended Posts

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

Share this post


Link to post
Share on other sites

TortoiseGIT guide moved back into its own topic for easier seaching / discussion until I can put it on the wiki. It shouldn't have been merged into the middle of a discussion about the commandline.

Edited by MrSmite
  • Upvote 5

Share this post


Link to post
Share on other sites

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

Share this post


Link to post
Share on other sites

Create an account or sign in to comment

You need to be a member in order to leave a comment

Create an account

Sign up for a new account in our community. It's easy!

Register a new account

Sign in

Already have an account? Sign in here.

Sign In Now

  • Recently Browsing   0 members

    No registered users viewing this page.

×