-
Notifications
You must be signed in to change notification settings - Fork 1
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Added yml file generation and verifier class replacing random #12
Conversation
Can we delete the files that this is adding that are not part of the business logic changed? Surely we don't need to merge 18,000 file changes to develop |
...Builder/MTG-Deck-Builder-master/src/main/java/mtgdeckbuilder/frontend/CardsDisplayPanel.java
Outdated
Show resolved
Hide resolved
I tried to remove unnecessary files and resolved the conflicts. Please let me know if any other change that needs to be done (I am new to git so learning things). |
No worries! :) It is still saying there are 5000+ files being changed. We have recently configured the .gitignore to ignore files in database, benchmarks, and suitableprgms, but I think this isn't being reflected in your changes because they have already been committed. Our most current version of develop has these files deleted, which is what is creating the conflict. Could you please delete the following directories and commit that change? /database/ |
Hi @charles-moloney I took another shot and removed these directories from my last commit using following commands git rm -rf database/ Can you check and confirm that these unnecessary files have been removed? Thanks. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Will advise being careful while merging (especially in transform/Main), but this overall looks good. Thank you for removing the extra files,
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Charles marked one and I marked 2 other spots with merge conflict markers left over
Hi @charles-moloney and @jckreg thanks for the review and feedback. I have incorporated the changes suggested. Please let me know if anything is remaining. Further, I have included my manually converted benchmarks for the SVCOMP submission in the folder svcomp-benchmarks. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
These files should be removed
No description provided.