search

Vertfromage / ManFight

Two classes Man and ManFight that together make a fun little text game
MIT License
7 stars 29 forks source link

This project is being 'managed' by a github newbie 'me' - Helpful advice/links please #13

Closed Vertfromage closed 5 years ago

Vertfromage commented 5 years ago

So opened this project up for Hacktoberfest, and I've gotten lots of contributors and it's great and fun, but I've discovered that I have no idea about merge conflicts.

I know what they are, but I've been using github in the browser and with github desktop and I'm not sure about how to resolve them using github desktop and I have git bash on my computer but I've barely touched it so it's a bit intimidating to use.

I use intellij for the java programming course I've been using and I know there's a tool in it that allows me to compare files in it, can I use that to resolve the conflicts before pushing to github from github desktop?

AlexDvorak commented 5 years ago

How to resolve PRs on Github How PRs work in general The tool you're probably thinking of in IntelliJ is documented here but generally, resolving on Github is easier

Vertfromage commented 5 years ago

Thank you, AlexDvorak. Thankfully so far people have resolved the conflicts themselves, which is good because the resolve conflicts button wasn't working and I would have had to use the command line and that seemed intimidating. I should probably do a github minicourse on udemy or something because I've read a couple articles and played around with it but I still feel confused.