On 2015-02-28, at 1:54 AM, Nicolas Dermine wrote:
>
> You can use (with care) `git push --force` in this case.
>
> nico
Thanks. I'm starting to learn why there is a private and a public repository --
to give you a chance to clean up your mistakes before publishing.
--
You received this messa
Hi Michael,
On Thu, Feb 26, 2015 at 7:51 AM, Michael wrote:
>
> On 2015-02-22, at 9:04 PM, Nicolas Dermine wrote:
>
>> Hi Michael,
>>
>> On Mon, Feb 23, 2015 at 2:17 AM, Michael wrote:
>>> So a quick question: How do I undo/abort a merge?
>>>
>>> I am learning, and experimenting. I was experime
Hi Michael,
On Mon, Feb 23, 2015 at 8:41 AM, Michael wrote:
>
> On 2015-02-22, at 9:04 PM, Nicolas Dermine wrote:
>
>> Hi Michael,
>>
>> On Mon, Feb 23, 2015 at 2:17 AM, Michael wrote:
>>> So a quick question: How do I undo/abort a merge?
>>>
>>> I am learning, and experimenting. I was experime
On 2015-02-22, at 9:04 PM, Nicolas Dermine wrote:
> Hi Michael,
>
> On Mon, Feb 23, 2015 at 2:17 AM, Michael wrote:
>> So a quick question: How do I undo/abort a merge?
>>
>> I am learning, and experimenting. I was experimenting with "git merge",
>> forgot the "--no-commit", and discovered t
On 2015-02-22, at 9:04 PM, Nicolas Dermine wrote:
> Hi Michael,
>
> On Mon, Feb 23, 2015 at 2:17 AM, Michael wrote:
>> So a quick question: How do I undo/abort a merge?
>>
>> I am learning, and experimenting. I was experimenting with "git merge",
>> forgot the "--no-commit", and discovered t
Hi Michael,
On Mon, Feb 23, 2015 at 2:17 AM, Michael wrote:
> So a quick question: How do I undo/abort a merge?
>
> I am learning, and experimenting. I was experimenting with "git merge",
> forgot the "--no-commit", and discovered the hard way that aborting the
> editor that comes up without sa
So a quick question: How do I undo/abort a merge?
I am learning, and experimenting. I was experimenting with "git merge", forgot
the "--no-commit", and discovered the hard way that aborting the editor that
comes up without saving does NOT abort the merge.
And git merge --abort fails, because t