Closed carlschroedl closed 7 years ago
It looks like the only conflict is in the enumeration of plugins in the pom:
<!-- List of modules -->
<modules>
<!-- Add here the paths of all modules (e.g. <module>modules/MyModule</module>) -->
<<<<<<< HEAD
<module>modules/MinimumSpanningTree</module>
=======
<module>modules/GeoLayout</module>
<module>modules/LinkfluencePlugin</module>
<module>modules/KBraceFilter</module>
<module>modules/Multimode-Networks</module>
<module>modules/JsonExporter</module>
<module>modules/SigmaExporter</module>
<module>modules/NodeColorManager</module>
<module>modules/GraphvizLayout</module>
<module>modules/GraphStreaming</module>
<module>modules/DesktopStreaming</module>
<module>modules/StreamingAPI</module>
<module>modules/StreamingImpl</module>
<module>modules/JettyWrapper</module>
<module>modules/StreamingServer</module>
<module>modules/CircularLayout</module>
<module>modules/SemanticWebImport</module>
<module>modules/loxawebsiteexport</module>
<module>modules/Export-To-Earth</module>
<module>modules/MapOfCountries</module>
<module>modules/ScriptingPlugin</module>
<module>modules/TwitterStreamingImporter</module>
<module>modules/IsometricLayout</module>
<module>modules/NetworkSplitter3D</module>
<module>modules/ExcelCsvImporter</module>
<module>modules/OracleDriver</module>
<module>modules/EventGraphLayout</module>
<module>modules/Lineage</module>
<module>modules/MdsLayout</module>
<module>modules/filterfromfile</module>
<module>modules/GiveColorToNodes</module>
<module>modules/GiveColorToEdges</module>
<module>modules/GravityPlugin</module>
<module>modules/MdsMetric</module>
<module>modules/VectorCalculator</module>
<module>modules/PrestigePlugin</module>
>>>>>>> fb3eb2af7db865b64ad3fc02cc0405e708fdd2c6
</modules>
Is it better for me to resolve this, or for you?
Thanks for the pull request! I will review it as soon as possible. Don't worry about that conflict, it always needs to be resolved manually.
Thanks for volunteering to resolve the conflict!
Apologies, this pull request includes several test resources that are not used. The only ones used are:
The following are not used:
I believe it is prudent to delete the unused test resources. Just like I mentioned above, I can do that by either (A): simply git rm
-ing the file on my end, or, if you prefer, I can (B): altogether eliminate the file from the history of this branch and force push to update the pull request. Which do you prefer?
I should mention that I've rewritten history many times in the past with native git as well as with BFG Repo-Cleaner, so there's no need to worry about me accidentally destroying the good parts of the history while eliminating the bad parts. In other words, don't be afraid that I will screw up option (B) and delete the plugin :)
Hi, I don't mind if you rewrite history, I have not cloned it yet.
Actually, remove unnecessary files if you can please. If the files are just small examples or similar we can merge them.
By the way, it's possible to include demo screenshots for your plugin that will appear in the new plugins site. Just drop them in src/img folder like https://github.com/gephi/gephi-plugins/tree/geolayout-plugin/modules/GeoLayout/src/img
Thanks! I will rewrite history to remove the unnecessary files. I didn't know about the src/img
feature. I will add a couple images.
The earliest I can resume work on this pull request is January 5th.
Closing this in case there are stale refs. Have opened #140 for the cleaned history.
Hello Gephi team! Thanks for the excellent instructions on how to contribute plugins in version 0.9. This pull request upgrades my 0.8-compatible plugin (formerly called SpanningTree) to be compatible with 0.9. Please let me know what you think!