Skip to content
GitLab
    • GitLab: the DevOps platform
    • Explore GitLab
    • Install GitLab
    • How GitLab compares
    • Get started
    • GitLab docs
    • GitLab Learn
  • Pricing
  • Talk to an expert
  • /
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
    • Switch to GitLab Next
    Projects Groups Topics Snippets
  • Register
  • Sign in
  • TortoiseGit TortoiseGit
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributor statistics
    • Graph
    • Compare revisions
    • Locked files
  • Issues 380
    • Issues 380
    • List
    • Boards
    • Service Desk
    • Milestones
  • Merge requests 16
    • Merge requests 16
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
    • Test cases
  • Deployments
    • Deployments
    • Releases
  • Analytics
    • Analytics
    • Value stream
    • CI/CD
    • Code review
    • Insights
    • Issue
    • Repository
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar
  • TortoiseGitTortoiseGit
  • TortoiseGitTortoiseGit
  • Issues
  • #405
Closed
Open
Issue created Aug 02, 2015 by Sven Strickroth@mrtuxOwner

Merge commit message when there is a conflict

By vvatas... on April 25, 2010 22:54 (imported from Google Code)


What steps will reproduce the problem?

  1. Try to merge two branches. TortoiseGit has an option to autogen commit
    message. But if there is merge conflict, the autogen message from git is
    missing and I type by hand new message at commit dialog.

What is the expected output? What do you see instead?
I'm trying to get detailed autogen commit message from git, instead I
write my own message explaining the commit by hand.

What version of the product are you using? On what operating system?
I'm using TortoiseGit-1.3.6.0-32bit.msi on winXP SP3

Please provide any additional information below.
I'm not sure if this is an issue with git/tortoisegit or I simply don't
know how to use them correctly. Please excuse me if this is not an issue.
There is this tool git-fmt-merge-msg, that can be usefull.

To upload designs, you'll need to enable LFS and have an admin enable hashed storage. More information
Assignee
Assign to
Time tracking