We will be moving to GitHub

[Chris Angelico]

On Sun, Jan 3, 2016 at 11:33 AM, Marko Rauhamaa <marko at pacujo.net> wrote:
>> That's a constantly-debated point, and it's actually possible to make
>> git accept this, although it's not a normal workflow. Instead, you
>> just 'git pull' (possibly with --rebase) before you 'git push'. You
>> either create a new merge commit, or make it very clear that you are
>> changing your commits to pretend they were committed after the
>> already-pushed ones. Or you do a force-push and discard the other
>> commits (this is correct if you amended a commit). You HAVE to choose
>> because these are three viable solutions, and only a human can make
>> the decision.
>>
>> Teamware presumably picked one of them,
>
> Teamware didn't have to pick any of them since Teamware's commits were
> done per individual files. The repository didn't have a commit history.
>
> Thus, Teamware was equivalent to Hg/Git with each file treated as an
> independent repository.

And what if you and someone else edit different parts of the same
file? How is that handled? Why should the top and bottom of one file
be dramatically different from two separate files?

ChrisA