Improve UI in 'merge branches'

[miparnisari]

When you go to Commands > Merge branches and see this:

I'm always confused as to what the end result will be.

I think it would be clearer to show something like

Merge branch [master]

into currrent branch [origin/ux-redesign]

[vbjay]

There is a help ui on the left.

On Thu, Jun 2, 2016 at 3:07 PM María Inés Parnisari <
notifications@github.com> wrote:

When you go to Commands > Merge branches and see this:

[image: merge]
https://cloud.githubusercontent.com/assets/5374887/15757402/c546b64c-28db-11e6-8b0e-28f71639a75a.png

I'm always confused as to what the end result will be.

I think it would be clearer to show something like

Merge branch [master]

into currrent branch [origin/ux-redesign]

—
You are receiving this because you are subscribed to this thread.
Reply to this email directly, view it on GitHub
#3208, or mute the
thread
https://github.com/notifications/unsubscribe/ADdhsVBiPSUYZuSiBMxTtedap6-P3f_Mks5qHynpgaJpZM4Is4Qy
.

[miparnisari]

I never look at that 😛

[hypersw]

@vbjay: the help UI is a bit schizophrenic, sorry :) does not make things simpler as it should.
@miparnisari: I think replacing Merge with with Merge from would totally do the thing, wouldn't it?

[vbjay]

@hypersw LOL!

Take the changes in the selected branch and put them in the current branch. Notice the into current branch label. So in this case spreadsheet commits would go into dev.

[miparnisari]

@hypersw no, I don't think so. Actually that would make it more unclear. I never heard of the phrase "merge from".

Think about the way I propose. It reads like a sentence.

[ghanique]

I'm never confused about what will happen because I know what branch is
currently checked out and as soon as I right click the branch I want to
merge it into, I know what will happen and I pretty much ignore the Merge
screen (with the exception of the "Always create a commit checkbox").
That said: simply rewording and reordering the merge window would indeed
clarify things. I like the sketch.
(Personally the pictures on the left of the current Merge window never were
that helpful and neither are the ones on the Rebase window).

On Fri, Jun 3, 2016 at 5:05 AM María Inés Parnisari <
notifications@github.com> wrote:

@hypersw https://github.com/hypersw no, I don't think so. Actually that
would make it more unclear. I never heard of the phrase "merge from".

Think about the way I propose. It reads like a sentence.

[image: mockup]
https://cloud.githubusercontent.com/assets/5374887/15767486/c7110e44-291e-11e6-93f5-0351ce6380ce.png

—
You are receiving this because you are subscribed to this thread.
Reply to this email directly, view it on GitHub
#3208 (comment),
or mute the thread
https://github.com/notifications/unsubscribe/ABser9QmzQDupa6QRhRlfkheP48TcgJ4ks5qH5nggaJpZM4Is4Qy
.

[jeffqc]

I support this change. Merge X into Y is way more clear than "Current branch: Y, merge with X"

[orao]

@ghanique

... and as soon as I right click the branch I want to merge it into...

I believe you mean "merge from"

[jbialobr]

@miparnisari I agree, 'merge into' better describes the direction of the merge.

[phillijw]

Another vote. It's easy but a huge improvement

[spencercrissman]

Took a stab at this.

#3349