[dmd-internals] What is the necessary to increase speed of merging?

[Jacob Carlborg]

On 13 nov 2011, at 11:39, Walter Bright wrote:

> 
> 
> On 11/12/2011 6:23 AM, Jason House wrote:
>> 
>> I've been wondering if it would be a good idea to set up a workflow where Walter does more than one pull request at a time. After testing all individual pulls, the auto tester could try testing all (passing) pulls from a single author all applied on top of each other. If that larger test passes, then maybe it could save several steps for Walter by handling multiple pull requests at once?
> 
> I've avoided multiple pulls at once, because when they fail it's just miserable.

I you do everything on your local machine it's easy to rewrite history and start all over, if necessary.

git reset --hard <hash>

The above command will rewrite history and remove everything commit made after <hash>. This is a good page describing different ways of undoing commits: http://book.git-scm.com/4_undoing_in_git_-_reset,_checkout_and_revert.html