need tut how to merge patches

[SkullDrago]

Hello i need a tut how i can merge patches so i can use them.

auctionhousebot and arena use both the chat.cpp so they give errors at merging in git.

So i think to merge them to one patch file i can use both without that error.

[DasBlub]

first apply the first patch and then apply the second one. this will generate special lines in your sourceode with "<<<<" and ">>>>". just merge them manually and then you've applied both patches