Comments (2)
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
from manfight.
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.
from manfight.
Related Issues (8)
- Improve the game HOT 14
- Incorporate Insults.java into manfight or add extra insults to Insults.java HOT 3
- Incorporate Insults.java into manFight so that players can insult each other.
- Add funny Insults to Insults.java Beginners Only. HOT 3
- Catch error of entering anything besides 1 or 2 (fighter or magician)
- Implement a summon monster attack in Fighter.java HOT 2
- Running the game HOT 1
Recommend Projects
-
React
A declarative, efficient, and flexible JavaScript library for building user interfaces.
-
Vue.js
🖖 Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.
-
Typescript
TypeScript is a superset of JavaScript that compiles to clean JavaScript output.
-
TensorFlow
An Open Source Machine Learning Framework for Everyone
-
Django
The Web framework for perfectionists with deadlines.
-
Laravel
A PHP framework for web artisans
-
D3
Bring data to life with SVG, Canvas and HTML. 📊📈🎉
-
Recommend Topics
-
javascript
JavaScript (JS) is a lightweight interpreted programming language with first-class functions.
-
web
Some thing interesting about web. New door for the world.
-
server
A server is a program made to process requests and deliver data to clients.
-
Machine learning
Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.
-
Visualization
Some thing interesting about visualization, use data art
-
Game
Some thing interesting about game, make everyone happy.
Recommend Org
-
Facebook
We are working to build community through open source technology. NB: members must have two-factor auth.
-
Microsoft
Open source projects and samples from Microsoft.
-
Google
Google ❤️ Open Source for everyone.
-
Alibaba
Alibaba Open Source for everyone
-
D3
Data-Driven Documents codes.
-
Tencent
China tencent open source team.
from manfight.