Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Already on GitHub? Sign in to your account

Hi, i just downloaded you example but not working #3

Closed
TomTheRock opened this Issue May 13, 2014 · 12 comments

Comments

Projects
None yet
2 participants

the autoloader vendor.php doesn´t exist.

i tryed the online example which is very nice. Is there a Option to merge the stuff if not all conflicts are marked, then it would be perfect i think(maybe as Option)

Greetings
Tom

Owner

Xiphe commented May 13, 2014

Hey Tom,

I just found noticed that the installation documentation in the readme file was outdated.
Please retry installing the example playground.

For your other concern, i wonder how you would like to merge unsolved conflicts, can you give me a concrete example?

ah perfect will try this Installation playground.

If you have 2 files and 3 conflicts but 1-2 conflicts are only, let me say not important, so maybe you want only select 1 conflict which you want to merge/update.

This might be usefull if you have 2 HTML files where you want update only a part of your code and not all.

Greetings
Tom

Owner

Xiphe commented May 13, 2014

so in other words you would like to have an option to have all conflicts to be resolved by using the left side. Am i right?

no, example:

left side(original): 3 conflicts
right side(new): 1 conflict selected

so the right side get/removed only the part which you have selected and get the new result.

Owner

Xiphe commented May 13, 2014

Jeah i understand.
I think the easiest way would be to call useLeft shortly after initiation of the plugin. So all conflicts will use the left side by default and then you can click on the right sides you want to use.

I think it's crucial that we have a visual feedback on witch site of the conflict we're going to use.

If we just use the left one, if the user has not selected anything. Important changes might get lost.

Owner

Xiphe commented May 13, 2014

actually i just noticed that the previous documentation on how to install was right, please recheck.

ah ok that sounds good, i will test this on evening or tomorrow.

Ty for your fast Support!

Xiphe added a commit that referenced this issue May 13, 2014

Owner

Xiphe commented May 13, 2014

So i just noticed we were not able to call methods, due tu a typo.
I fixed that and now you would be able to do this in the example/index.php

jQuery(document).ready(function($) {
    $('.Differences').phpdiffmerge({
        left: left,
        right: right,
        pupupResult: true,
        debug: true,
        merged: function(a,b,c) {
            console.log('Merge completed.');
        }
    }).phpdiffmerge('useLeft');
});

just downloaded the newest release zip (v0.3.2) and try to use this on my webserver,
but how can i install it?

"npm install" means over github or?

Owner

Xiphe commented May 13, 2014

No, You Need to have node and composer installed locally and than you open your command line, cd into the project folder and than execute npm install.

Owner

Xiphe commented May 13, 2014

So, as mentioned in the readme, this is designed to work on top of https://github.com/chrisboulton/php-diff. If you got that working, you can add the files from the dist folder and follow the usage example.
The stuff i mentioned before (npm and composer) are helpers to get the dev-dependencies installed really easy. If you want to use this in production you just need a webserver with php, php-diff, jQuery and this plugin. But you need to install and setup php-diff by yourself since it's not part of this plugin.

Owner

Xiphe commented Aug 16, 2014

Closing. Let me know if i can help with anything.

@Xiphe Xiphe closed this Aug 16, 2014

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment