On 11/18/19 12:20 PM, Emilian Bold wrote:
You are angry. But you did ask if you are doing something wrong and re-downloading the entire repository for 1 force modified commit is not the way to go.
You're right. I'm sorry, Emilian. I was wrong to disregard your honest answer and use it just to restate my own opinion.
If I understand correctly, any method other than "git pull" has to reconstruct the history manually to match the author's rewritten history. That seems more prone to errors -- especially considering the level of my Git skills. When testing, I want to be certain I have exactly the same code as the author.
In this case there are three commits, and my naive "git pull" ended up with duplicates in the history that I wasn't at all comfortable trying to correct, so I started over with a new cloned copy.
Not sure what the guidelines say, but force push does happen and it would be nice for a single PR to support that.
Right. And by the way, I'll take Thomas Zimmermann's code any way he provides it, because I'm so grateful for his fixes.
I'm suggesting that pull request authors avoid a rebase or squash followed by a forced push when they know other people have a cloned copy that they're trying to keep in sync. Any other time is fine.
Thank you for your patience. John --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@netbeans.apache.org For additional commands, e-mail: dev-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
