Opened 4 months ago

Closed 4 months ago

#22314 closed enhancement (fixed)

Ignore git mergetool backup files

Reported by: cypherpunks Owned by: irl
Priority: Medium Milestone:
Component: Metrics/Atlas Version:
Severity: Normal Keywords:
Cc: Actual Points:
Parent ID: Points:
Reviewer: Sponsor:

Description

I use the git mergetool for handling merge conflicts. The tool leaves .orig files as backups to the original files. These files make git status complain about untracked files and, in my case, highlights this in the terminal.

Child Tickets

Attachments (1)

0001-Ignore-git-mergetool-backup-files.patch (484 bytes) - added by cypherpunks 4 months ago.

Download all attachments as: .zip

Change History (4)

Changed 4 months ago by cypherpunks

comment:1 Changed 4 months ago by cypherpunks

Status: newneeds_review
Type: defectenhancement

The attached patch creates the .gitignore file and adds the orig extension to be ignored.

comment:2 Changed 4 months ago by irl

Status: needs_reviewmerge_ready

This looks good to me. Will probably add Vim swap files into this when I merge.

Thanks.

comment:3 Changed 4 months ago by irl

Resolution: fixed
Status: merge_readyclosed

Merged.

Note: See TracTickets for help on using tickets.