|
|
|
|
|
|
by rquirk
4141 days ago
|
|
|
Seems they no longer use this method. Instead they use `CHANGELOG merge=union` in a .gitattributes file at the root of the repository. That means that conflicting merges take changes from both sides of the conflict. It's what you usually want with a changelog. |
|
|