#140 ✓resolved
Ákos Gyimesi

GitX cannot create merge commits

Reported by Ákos Gyimesi | April 22nd, 2009 @ 05:38 PM | in 0.7

If you resolve a merge conflict and then commit with GitX, the created commit object contains only one parent (the head of the current branch). It would be useful to create a merge commit in this case, even if GitX itself cannot perform a merge (yet).

GitX version: 0.6.2

Comments and changes to this ticket

  • Pieter de Bie

    Pieter de Bie May 28th, 2009 @ 04:41 PM

    • Tag set to enhancement, feature, request
    • State changed from “new” to “small”

    Yes, that would be nice. It would even be nice for now to have something that warns against committing a merge commit.

  • Pieter de Bie

    Pieter de Bie June 20th, 2009 @ 09:50 PM

    • State changed from “small” to “open”
    • Milestone set to 0.7

    Let's add a warning in 0.7

  • Pieter de Bie

    Pieter de Bie June 20th, 2009 @ 10:11 PM

    • State changed from “open” to “resolved”

    Fixed in d6ccf34881 (CommitController: Reject merges)

  • Reyes D

    Reyes D September 7th, 2017 @ 06:25 AM

    Pretty valuable update about the GitX hope you will get the solution of the related problem from professionals. On internet number of forums are available where people discuss the problems and get the help essay writing with perfect solution. Keep going to share problems and solutions here that would be helpful.

  • lioneljohn

    lioneljohn February 12th, 2018 @ 08:30 AM

    I have heard about these merge conflicts while using the software. Is it possible to create the merge commits manually if it is not working in the software? I think it is possible with the newer versions to create it by ourselves. Stay updated with the details regarding this. brooke sutton

Please Sign in or create a free account to add a new ticket.

With your very own profile, you can contribute to projects, track your activity, watch tickets, receive and update tickets through your email and much more.

New-ticket Create new ticket

Create your profile

Help contribute to this project by taking a few moments to create your personal profile. Create your profile »

GitX is the nice-looking gitk clone for OS X

People watching this ticket

Referenced by

Pages