search

Darkhax-Minecraft / WAWLA

What Are We Looking At (WAWLA) is a mod aimed and drawing more attention to providing in-game documentation for players.
GNU Lesser General Public License v2.1
32 stars 22 forks source link

Fix a small typo #53

Closed TartaricAcid closed 8 years ago

TartaricAcid commented 8 years ago

I'm so sorry for my carelessness

TartaricAcid commented 8 years ago

This branch has conflicts that must be resolved

But I don't know how to resolve it

Darkhax commented 8 years ago

Resolving merge conflicts can be fairly difficult if you're not familiar with how Git works. The general idea is that you need to update your fork to match the latest version, and then make a new commit. I don't know if you use the git command line, but it would look something like this. 

git remote add upstream https://github.com/Darkhax-Minecraft/WAWLA.git
git fetch upstream
git checkout master
git rebase upstream/master
git push -f

You may also need to undo these last two commits, which can be done by doing

git reset --soft HEAD~2

where 2 is the amount of commits you want to undo. To push after this, you would use git push -f.

Edit: Alternatively, I can do these changes on my end if it doesn't work out.

TartaricAcid commented 8 years ago

Thank you :)