Comments (5)
Have a look in my improve-code branch as well, I've done the same as well.
from jadventure.
@verhagen unfortunately I've had to come to the conclusion that your improve-code branch is way too big for me to look through. With 100 commits ahead and 20+ commits behind master, I can't differentiate which is the same, which is behind, and which is ahead. So honestly your best bet is to start multiple branches which deal with different issues and connect those specific branches as pull requests with specific issues. As it is right now, not only is the improve-code branch too big, it also contains many controversial changes which we may not want to be implemented. Now I and some of the other maintainers (i.e @hawk554 or @indivisible-irl ) could go through and git cherry-pick the specific commits but honestly it's just much easier to leave it alone and let those changes come in organically one at a time.
Sorry but unless someone is willing to fork your branch, fix all the merge conflict and then separate all the commits apart, it's gonna be too difficult to merge.
from jadventure.
fixed.
from jadventure.
I think several of the changes, done in these last 20 commits, I did fix already as well, in the improve-code branch.
There are more test and the code is a lot cleaner I think. Have a look through the issues I resolved to get an idea.
Indeed merging is not easy, I do understand that as well. Is it possible the pull my branch in, check which of the 20 commits have not been resolved in the improve-code branch, re-do them there and then merge the improve-code into master.
from jadventure.
- I think your link to the resolved issues is wrong.
- Yes, it's possible but not worth it and not (as I believe) good practice. Rather, it is better to cherry pick from your branch what hasn't been fixed into master and only merge those. We merge from outside in and not inside out and then back again. Too much confusion.
- And unfortunately, even if you did fix them, they're not recognized as valid fixes until a patch is requested and merged.
from jadventure.
Related Issues (20)
- NPC health carries over when reverting save HOT 8
- Selling to guide and then killing him causes negative gold drop HOT 5
- Creating new profiles deletes equipped armors in all other profiles HOT 2
- Saving after killing an NPC on one profile saves NPC death on all profiles HOT 1
- Items should cost more when you sell them to the npc HOT 4
- Merge json/ and json/original_data HOT 1
- Conversation menu infinite loop HOT 5
- when buy things with Guide,it will always loop.[BUG] HOT 1
- Standalone jar doesn't recognize external libraries HOT 4
- Use Adapt for Intent Parsing HOT 2
- i lost my file HOT 3
- prices display while selling HOT 1
- Save Selection Should be Clearer HOT 1
- Debug Error Reporting
- Link github pages site on title HOT 2
- Small amount of Dead code in Main Menu class HOT 4
- QueueProvider rework suggestion HOT 3
- Trading into menus package
- Jacoco breaks build
- Cucumber tests
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 jadventure.