https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=19474
--- Comment #25 from Kyle M Hall <k...@bywatersolutions.com> --- (In reply to Jonathan Druart from comment #24) > .gitignore is not tracked yet, so I get: > > error: The following untracked working tree files would be overwritten by > merge: > .gitignore > Please move or remove them before you merge. Sounds like you added your own .gitignore file. Just remove it and everything should apply just fine. You could add a followup to merge the two versions if what you have in yours would be generally useful. -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list Koha-bugs@lists.koha-community.org http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs website : http://www.koha-community.org/ git : http://git.koha-community.org/ bugs : http://bugs.koha-community.org/