Sorry for the omission. The command sequence was truncated operating under
the assumption that git add preceeded the commit commands.
On Fri, Jul 21, 2017 at 7:45 PM, Michael wrote:
>
> On 2017-07-20, at 4:11 PM, Jon Erickson wrote:
>
> > To start,
On 2017-07-20, at 4:11 PM, Jon Erickson wrote:
> To start, the user that generated this error was advised to backout the
> resulting munge and use a standard merge to fix his problems. Following
> standard merging practices fixed his problems but his original approach
On 2017-07-20, at 4:11 PM, Jon Erickson wrote:
> To start, the user that generated this error was advised to backout the
> resulting munge and use a standard merge to fix his problems. Following
> standard merging practices fixed his problems but his original approach