search

fork-dev / TrackerWin

Bug and issue tracker for Fork for Windows
461 stars 10 forks source link

Enhancement: merge/rebase info #2349

Open lenochware opened 2 days ago

lenochware commented 2 days ago

I am usually merging branches by dragging and dropping source branch onto target branch (in "branches" tree at left side). With merge, it works fine. When I checked "rebase" - source branch was modified instead of target branch as I supposed (it works in opposite way than merge). I know that this is some weird git logic, but I found it very confusing and annoying.

Could you adjust the message before merge/rebase to make it absolutely clear which branch will be modified?

DanPristupov commented 2 days ago

Could you adjust the message

Can you show a screenshot of this particular message?

lenochware commented 1 day ago

Clipboard01

I dragged "test1" onto "target" and choose rebase. This will add commits into "test1" branch which confused me.

DanPristupov commented 1 day ago

This will add commits into "test1" branch which confused me.

No, it will copy/move commits from 'test1' on 'target'.