Am Samstag, 28. Januar 2017, 00:31:59 CET schrieb Martin Owens:
On Fri, 2017-01-27 at 21:18 -0800, Bryce Harrington wrote:
That sounds frustrating.
Can you explain in more detail what the issue was, so we know what to avoid?
It's about how the modifications are recorded as merges. Git has this option of making the history all nice and flat, i.e. a rebase. I needed to use it because Moini's commits had caused 90% of the history to be doubled, basically making the repository broken.
So as long as you never ever have to touch the history once it's made, it might be ok. But other git experts would be good.
Just a general remark: Once git is used for real in Inkscape you should never ever rebase anything that was pushed already. Having a nice flat history isn't something to strive for with git.
Further reading: https://stackoverflow.com/questions/2715085/rebasing-and-what-does-one-mean-...
Martin,
Tobias