search

wickedest / Mergely

Merge and diff documents online
http://www.mergely.com
Other
1.17k stars 228 forks source link

Insert diff above or below #36

Closed sisao closed 8 years ago

sisao commented 8 years ago

Hi, is it possible to merge/insert a diff line above or below the opposite reference line? Like in Meld with pressing the Ctrl-key?

Regards, Stefan

wickedest commented 8 years ago

Hi Stefan,

No, Mergely cannot do that. I'm not sure about the value of such a feature. I looked at the Meld website to see what the feature actually did, but could not find any reference to it.

Jamie

On 16 December 2015 at 10:36, slorenz notifications@github.com wrote:

Hi, is it possible to merge/insert a diff line above or below the opposite reference line? Like in Meld with pressing the Ctrl-key?

Regards, Stefan

— Reply to this email directly or view it on GitHub https://github.com/wickedest/Mergely/issues/36.

sisao commented 8 years ago

Np, I find it useful sometimes if you have to solve merge conflics...

fyi: http://meldmerge.org/help/file-changes.html

2015-12-24 9:33 GMT+01:00 wickedest notifications@github.com:

Hi Stefan,

No, Mergely cannot do that. I'm not sure about the value of such a feature. I looked at the Meld website to see what the feature actually did, but could not find any reference to it.

Jamie

On 16 December 2015 at 10:36, slorenz notifications@github.com wrote:

Hi, is it possible to merge/insert a diff line above or below the opposite reference line? Like in Meld with pressing the Ctrl-key?

Regards, Stefan

— Reply to this email directly or view it on GitHub https://github.com/wickedest/Mergely/issues/36.

— Reply to this email directly or view it on GitHub https://github.com/wickedest/Mergely/issues/36#issuecomment-167068409.

wickedest commented 8 years ago

From the page you gave me, Mergely has equivalents. You can navigate between changes using Alt-Down Arrow, and Alt-Up Arrow. You can merge-right and left using Alt-Right Arrow and Alt-Left Arrow.

On 24 December 2015 at 08:38, slorenz notifications@github.com wrote:

Np, I find it useful sometimes if you have to solve merge conflics...

fyi: http://meldmerge.org/help/file-changes.html

2015-12-24 9:33 GMT+01:00 wickedest notifications@github.com:

Hi Stefan,

No, Mergely cannot do that. I'm not sure about the value of such a feature. I looked at the Meld website to see what the feature actually did, but could not find any reference to it.

Jamie

On 16 December 2015 at 10:36, slorenz notifications@github.com wrote:

Hi, is it possible to merge/insert a diff line above or below the opposite reference line? Like in Meld with pressing the Ctrl-key?

Regards, Stefan

— Reply to this email directly or view it on GitHub https://github.com/wickedest/Mergely/issues/36.

— Reply to this email directly or view it on GitHub https://github.com/wickedest/Mergely/issues/36#issuecomment-167068409.

— Reply to this email directly or view it on GitHub https://github.com/wickedest/Mergely/issues/36#issuecomment-167069359.