search

cboulanger / qx-contrib-Dialog

A set of often used dialog widgets for the qooxdoo framework (deprecated, use qooxdoo/qxl.dialog instead)
6 stars 10 forks source link

copied files from Derrell's offshoot of Dialog #20

Open derrell opened 6 years ago

derrell commented 6 years ago

This is simply copying in all of the files in source/class/dialog from my version. Watchathink?

cboulanger commented 6 years ago

But how would that work? This overwrites/reverts, for example, all changes that moved the widgets' base layout from groupbox to Composite and makes the images themeable - see, for example, https://github.com/cboulanger/qx-contrib-Dialog/pull/20/files. In order to merge the two repos, we would need some version that keeps additions while marking conflicts so that they can be dealt with case-by-case.

cboulanger commented 6 years ago

Or did I miss something? "This branch has no conflicts with the base branch" seems very wrong :-)

derrell commented 6 years ago

To create this, I took my ancient fork of your repo, "git fetch upstream" (which is your repo), "git checkout -b upstream upstream/master", and then created my own copy of that branch, "git checkout -b merge-derrell". From there, I did: 

cp ~/ME/Mutualink/wsg.git/frontend/Dialog.git/source/class/dialog/{Alert,Confirm,Dialog,Form,FormRenderer,FormTag,Login,Progress,Prompt,Select,Wizard}.js .
git commit -a -m "copied files from Derrell's offshoot of Dialog"
derrell commented 6 years ago

So there was no attempt yet to merge; only to get your version and mine into a state where they can be better compared and potentially merged.

cboulanger commented 6 years ago

Ah, ok, but I am wondering how this can be done. Usually, if two very different versions of a file are to be merged, one gets a file with conflicts, which can be manually edited on GitHub or more visually locally with the help of an IDE. Here I only get the option to merge it, which means overwrite my version of the Dialog classes. Maybe I can think of a way to create the conflict files tomorrow...