Skip to content

GitLab

  • Menu
Projects Groups Snippets
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Sign in / Register
  • meld meld
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
  • Issues 187
    • Issues 187
    • List
    • Boards
    • Service Desk
    • Milestones
  • Merge requests 5
    • Merge requests 5
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
  • Deployments
    • Deployments
    • Environments
    • Releases
  • Monitor
    • Monitor
    • Incidents
  • Packages & Registries
    • Packages & Registries
    • Container Registry
  • Analytics
    • Analytics
    • Value stream
    • CI/CD
    • Repository
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar
  • GNOME
  • meldmeld
  • Issues
  • #528

Closed
Open
Created Nov 19, 2020 by Julien Staub@atsju

using auto-merge in git won't add file automatically

I use Meld (3.20.2) with git to solve merge/rebase conflicts. Here is my .gitconfig :

[merge]
	tool = meld
[mergetool]
	keepBackup = false
[mergetool "meld"]
	path = C:/Program Files (x86)/Meld/Meld.exe
	useAutoMerge = true

When a file conflicts and is able to auto-merge, the file is not automatically added to files to be commited. Also a rebase will not continue automatically. So I run mergetool to solve the potential unresolved "conflict" and get :

$ git mergetool
No files need merging

I expect the automatically merged files to be added to commited files like when there is no conflict.

I also tried setting mergetool.meld.trustExitCode to true or false but his has no effect.

Assignee
Assign to
Time tracking