|
Question for you guys who know git... I made a goof and curious how to fix it... was just merging stuff in, then realized I forgot to push my latest version before I merged.
What's the easiest way to get those merges into my current local working version without losing the work I've already done on getting Draenor going.
|