 | Peter Wright on LED Chaser with only 4017… |
 | Maxim Masiutin on Delphi: There is a FastMM4 for… |
 | HeartWare on From Delphi 1: Type Compatibil… |
 | abouchez on From Delphi 1: Type Compatibil… |
 | Remy Lebeau on Can we truly assert that an ar… |
Posted by jpluimers on 2014/08/28
Often the git command-line is easier to than merge a combination of changes, moves and deletions using SourceTree.
If you know how to read the git status output, and to act accordingly.
This tells you how: Git: how to resolve merge conflicts | softwarecave.
–jeroen
Posted in Development, DVCS - Distributed Version Control, git, Power User, Source Code Management | Leave a Comment »
Posted by jpluimers on 2014/08/28
Quiz questions:
procedure TestHResult.Test_EOleException;
var
OleException: EOleException;
IResult: LongInt; // == HResult
UResult: Cardinal; // == DWord
begin
IResult := $800A11FD;
UResult := $800A11FD;
try
OleException := EOleException.Create('message', $800A11FD, 'source', 'helpfile', -1);
raise OleException;
except
on E: EOleException do
begin
if E.ErrorCode = $800A11FD then
Exit;
Self.CheckEquals(E.ErrorCode, $800A11FD, 'E.ErrorCode should equal $800A11FD');
end; // E: EOleException
end;
end;
Posted in Conference Topics, Conferences, Delphi, Delphi 4, Delphi 5, Delphi 6, Delphi 7, Delphi XE, Delphi XE2, Delphi XE3, Delphi XE4, Delphi XE5, Development, Event, Software Development | 2 Comments »
