[dmd-internals] Halp! need help fixing git master for dmd

[Daniel Murphy]

You had an old master, with your testCols commit on top.  Then you merged
upstream master into it.  Then you pushed that merge commit to upstream,
accidentally.

When you 'fixed' it, you made the testCols commit the new master.  This
discarded all the changes from the upstream master. (from the last day or
so)

Luckily this doesn't seem to happen very often.  To make this less likely,
I recommend you do not pull from upstream master manually, and you instead
have a sh/batch file that runs: `git pull upstream master --ff-only` which
will fail loudly if you have made changed in your master branch (rather
than silently creating a merge commit).

As for CRLFs, I recommend turning git's autocrlf off, so git no longer
messes with your line endings.

https://github.com/D-Programming-Language/dmd/pull/3307


On Fri, Feb 21, 2014 at 8:20 PM, Walter Bright <walter at digitalmars.com>wrote:

>
> On 2/21/2014 12:46 AM, Daniel Murphy wrote:
>
>> I've fixed it, please stop pushing to upstream.
>>
>>
> Hmm, the fix I made to testCols.d disappeared as well.
>
> The problem with testCols.d is it was added with CRLFs in it. This
> rendered my local git repository unusable, as it would insist I had
> uncommitted changes, but would not let me do anything with testCols.d, so I
> could not do anything. I couldn't even issue a pull request to fix
> testCols.d.
>
> I noticed that testCols.d is back to having CRLFs in it. This time,
> however, I won't try to fix it. Can you, please?
>
> _______________________________________________
> dmd-internals mailing list
> dmd-internals at puremagic.com
> http://lists.puremagic.com/mailman/listinfo/dmd-internals
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.puremagic.com/pipermail/dmd-internals/attachments/20140221/9cc702c3/attachment-0001.html>