Git Quick Reference list order

[Michael Doob]

In Appendix C of Git for Authors there is a handy quick reference for adding commits

to a definitive repository. I've attached a snapshot of the list. I have two questions:

1. In step 6, shouldn't it be git branch -D topic, that is, don't you have to force a

delete if it is done before a merge?

2. It seems to meet that the natural order would interchange step 6 and step 7, that

is, merge before delete. Are these two steps noncommutative?

Cheers,

Michael

[Rob Beezer]

Yes, looks to me like 6 and 7 need to swap. Then -d will be successful.

In the order as written a -d will fail (good, since...) and -D will mean losing
work.

On 5/6/20 9:24 AM, Michael Doob wrote:
> In Appendix C of Git for Authors there is a handy quick reference for adding commits
> to a definitive repository. I've attached a snapshot of the list. I have two
> questions:
>

> 1. In step 6, shouldn't it begit branch -D topic, that is, don't you have to force a

> delete if it is done before a merge?
>
> 2. It seems to meet that the natural order would interchange step 6 and step 7, that
> is, merge before delete. Are these two steps noncommutative?
>
> Cheers,
> Michael
>

> --
> You received this message because you are subscribed to the Google Groups
> "PreTeXt support" group.
> To unsubscribe from this group and stop receiving emails from it, send an email
> to pretext-suppo...@googlegroups.com
> <mailto:pretext-suppo...@googlegroups.com>.
> To view this discussion on the web visit
> https://groups.google.com/d/msgid/pretext-support/e8e57ca3-d232-4d5b-ad2a-d2f6e1b86d7e%40googlegroups.com
> <https://groups.google.com/d/msgid/pretext-support/e8e57ca3-d232-4d5b-ad2a-d2f6e1b86d7e%40googlegroups.com?utm_medium=email&utm_source=footer>.

[Michael Doob]

Thanks for the quick reply. I should add the Git for Authors is something I find

helpful as I seem to be able to find almost every possible way to make mistakes

with git.

I'll send a PR presently.

Cheers,

Michael

On Wednesday, May 6, 2020 at 11:44:42 AM UTC-5, Rob Beezer wrote:

Yes, looks to me like 6 and 7 need to swap.  Then -d will be successful.

In the order as written a -d will fail (good, since...) and -D will mean losing
work.


On 5/6/20 9:24 AM, Michael Doob wrote:
> In Appendix C of Git for Authors there is a handy quick reference for adding commits
> to a definitive repository. I've attached a snapshot of the list. I have two
> questions:
>
> 1. In step 6, shouldn't it begit branch -D topic, that is, don't you have to force a
> delete if it is done before a merge?
>
> 2. It seems to meet that the natural order would interchange step 6 and step 7, that
> is, merge before delete. Are these two steps noncommutative?
>
> Cheers,
> Michael
>
> --
> You received this message because you are subscribed to the Google Groups
> "PreTeXt support" group.
> To unsubscribe from this group and stop receiving emails from it, send an email

> to pretext...@googlegroups.com
> <mailto:pretext-support+unsub...@googlegroups.com>.

[Rob Beezer]

On 5/6/20 10:27 AM, Michael Doob wrote:
> Thanks for the quick reply. I should add the Git for Authors is something I find
> helpful as I seem to be able to find almost every possible way to make mistakes
> with git.

<soft-chuckle/>

Been there. In addition to the very useful "cheat sheets", I'm a fan of the
"principles" when things go south. I've never lost any work, but once got two
of everything (maybe a "git stash apply" when I thought I was doing a "git stash
pop").

https://pretextbook.org/gfa/html/principle-list.html

> I'll send a PR presently.

Thanks!