Suggest usage of git push --force-with-lease instead of git push -f in rebasing tutorials

[underyx]

area/documentation

[gitmate-bot]

Thanks for reporting this issue!

Your aid is required, fellow coalaian. Help us triage and solving this issue!

CC @sils1297, @AbdealiJK

[sils]

I'm not fully sure about that because you have to explain more to new people.

[Makman2]

I'm against this as I agree with @sils1297 , the command looks like it needs more explanation because of the "remote-tip-need-to-be-equal" protection, with our review system there is in principle no possibility to merge such malicious branches (master is protected by GitHub, notification in PR that branch is out-of-date, rultor refuses merge). Our workflow is also more like "that is definitely your branch" and no-one would touch it (unless there are special exceptions if someone wants to take over directly etc, though in fact there's no need for such arrangements).

[underyx]

Can't really refute all that, but just to reply to this one point:

Our workflow is also more like "that is definitely your branch"

I've deleted my own commit before with a force push when I forgot I had already changed something with the github.com editor :D

[Makman2]

don't do so :3

[sils]

so what do we do? I'm currently leaning towards the simpler solution. Might also be because I'm lazy and I'm in issue closing mood though :P

[Makman2]

maybe we can mention inside a note "if you want more protective behaviour, you can also use --force-with-lease" or so^^

[sils]

I like adding a note!
On 17 Jun 2016 6:26 p.m., "Mischa Krüger" notifications@github.com wrote:

maybe we can mention inside a note "if you want more protective behaviour,
you can also use --force-with-lease" or so^^

—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
#2250 (comment),
or mute the thread
https://github.com/notifications/unsubscribe/AFc6KN7rdeoV9JU25C4RonAw-9aFcgmOks5qMsrFgaJpZM4It10Q
.

[Adrianzatreanu]

This issue was moved to coala/documentation#38