[tor-bugs] #22314 [Metrics/Atlas]: Ignore git mergetool backup files

Tor Bug Tracker & Wiki blackhole at torproject.org
Sat May 20 17:17:35 UTC 2017


#22314: Ignore git mergetool backup files
-------------------------------+-----------------
     Reporter:  cypherpunks    |      Owner:  irl
         Type:  defect         |     Status:  new
     Priority:  Medium         |  Milestone:
    Component:  Metrics/Atlas  |    Version:
     Severity:  Normal         |   Keywords:
Actual Points:                 |  Parent ID:
       Points:                 |   Reviewer:
      Sponsor:                 |
-------------------------------+-----------------
 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.

--
Ticket URL: <https://trac.torproject.org/projects/tor/ticket/22314>
Tor Bug Tracker & Wiki <https://trac.torproject.org/>
The Tor Project: anonymity online


More information about the tor-bugs mailing list