search

soramimi / Guitar

Git GUI Client
https://soramimi.github.io/Guitar/
GNU General Public License v2.0
1.58k stars 127 forks source link

How to merge one branch into another? #128

Open fulalas opened 1 year ago

fulalas commented 1 year ago

When I'm on branch A and want to merge branch B into branch A, nothing happens, no command in the console output. I tried both official Guitar release 1.2.0 and current git.

Apart from that everything seems to be working! Nice job! :)

EDIT: I'm using Slackware x64 current, git 2.42.0

soramimi commented 1 year ago

Normal way:

  1. Checkout branch A
  2. Right click on branch B
  3. Choose 'Merge' from the menu
  4. Click OK on the dialog box

If this doesn't work, please run the 'git merge ...' command in the terminal and read the error message.

fulalas commented 1 year ago

Manual merge via other applications or terminal works.

The issue happens only when using Guitar. No command appears on the log window when I click on merge. Really nothing happens. :(