On 17/08/12 00:35, Pete Wyckoff wrote:
These patches rework how git p4 deals with conflicts that
arise during a git p4 submit. These may arise due to
changes that happened in p4 since the last git p4 sync.
Luke: I especially wanted to get this out as you suggested
that you had a different way
l...@diamand.org wrote on Fri, 17 Aug 2012 07:04 +0100:
On 17/08/12 00:35, Pete Wyckoff wrote:
These patches rework how git p4 deals with conflicts that
arise during a git p4 submit. These may arise due to
changes that happened in p4 since the last git p4 sync.
Luke: I especially wanted to
These patches rework how git p4 deals with conflicts that
arise during a git p4 submit. These may arise due to
changes that happened in p4 since the last git p4 sync.
Luke: I especially wanted to get this out as you suggested
that you had a different way of dealing with skipped commits.
The
3 matches
Mail list logo