[fpc-other] [fpc-pascal] Google Code closing down

[Martin Frb]

On 16/03/2015 14:18, Graeme Geldenhuys wrote:
> Hello Martin,
>
> On 2015-03-16 13:17, Martin Frb wrote:
>> Local commits (commit, without push) can be a huge advantage.
> Ah yes, but they loved the idea shortly afterwards.
As I said they *can* be a huge advantage.


>>    "svn up" is roughly equal to: stash, fetch and rebase (pull?), stash pop.
> A simple git alias can do that for you all in one command. ;-)
And in a GUI? The only GUI on windows that was to my taste, is Tortoise.

But if there is another GUI, that can do that?
On win, ideally with explorer integration and not custom drawn (its on 
windows, its hould look (aprox) like a win app)

True it is not the fault of GIT, if there is on frontend that suits 
me.... But it does not help



>> This is, if I want to update, and just be left with any merge conflicts
>> in by local changes.
> And that is why I trained them from the start to develop in local
> feature branches, and never directly in 'master' or 'develop' (any
> tracking branches). Follow that and you will never get a conflict on a
> 'git pull' again. In fact you don't need 'git pull' then, only 'git
> fetch' will suffice. Then when you have the time, you can review the
> latest changes from upstream (origin) and merge those into your local
> feature branch - when it suits you.
>

And while all this has many advantage, it is not the point.
Yes you can avoid (or defer) the merge conflicts. Which is again a good 
feature. Unless of course you are not interested in deferring them.