Public

Project privacy set to public. By default, its content is available to everyone (authenticated or not). Please note that more restrictive permissions might exist on some items.

stable

Clone or download

Read-only

request #13259: Disable auto-merging of lockfiles

Download Browse

Even if Git is able to merge changes on a lockfile, the resulting lockfile will be incoherent. By disabling the merge of those files we ensure the contributor has a clue that the merge needs to be dealt with manually. Change-Id: I57d6de65e46d92ff9225c3c2871ac97828e9756b

+2 −0
Thomas Gerbet (tgerbet) 2019-04-12 13:57
Thomas Gerbet (tgerbet) 2019-04-12 13:57
9454d133f7bf25a6e9be9f3953d160eea147d02a
612571c84df755479c408f0b417de58a4f16a80c
git #tuleap/stable/9454d133f7bf25a6e9be9f3953d160eea147d02a

Modified Files

Side by side diff
Inline diff
Name
A .gitattributes +2 −0 Go to diff View file