ZZZeus

Hi, THe file delete on local branch , modified on remote branch, no conflict when I merge with -(BOOL)mergeBranchIntoCurrentBranch:(GTBranch *)fromBranch withError:(NSError **)error;