It was a bit sad since we use scripts to do the merge, then we can
check the conflict list in the log message, and assign to separate
owners to resolve them.
Would it be possible to make it as an config option?
On Tue, Jul 7, 2015 at 12:08 AM, Matthieu Moy
matthieu@grenoble-inp.fr wrote:
[ Please, don't top-post on this list ]
Andrey Hsiao andreyhs...@gmail.com writes:
It was a bit sad since we use scripts to do the merge, then we can
check the conflict list in the log message, and assign to separate
owners to resolve them.
Would it be possible to make it as an config
Dear list:
In the past, when we do the merge in git, if conflicts occurred, when
we commit, the conflict list will be appended to the default commit
message automatically.
eg:
Conflicts:
a.java
b.java
Today, after using Git 2.3.0 for a merge, it seems now the conflict
list was commented
Andrey Hsiao andreyhs...@gmail.com writes:
Dear list:
In the past, when we do the merge in git, if conflicts occurred,
when we commit, the conflict list will be appended to
the default commit message automatically.
eg:
Conflicts:
a.java
b.java
Today, after using Git 2.3.0
Dear list:
In the past, when we do the merge in git, if conflicts occurred,
when we commit, the conflict list will be appended to
the default commit message automatically.
eg:
Conflicts:
a.java
b.java
Today, after using Git 2.3.0 for a merge, it seems now the conflict list
was
5 matches
Mail list logo
