On Wed, Apr 30, 2014 at 1:15 PM, Geert Bosch wrote:
>
> On Apr 28, 2014, at 02:29, Marat Radchenko wrote:
>
>> In short:
>> 1. Hack, hack, hack
>> 2. Commit
>> 3. Push, woops, reject (non-ff)
>> 4. Pull
>> 5. Push
>
> Just do pull --rebase? This is essentially the same as what SVN
> used to do in
Hi.
> Problem #6: push - reject - pull - push sequence sometimes transforms
> into a loop with several iterations and doesn't add happiness.
As far as I undestand, this is the most annoying thing. In
git (like other distributed systems), you cannot push your
changes unless you merge them with a v
On Apr 28, 2014, at 02:29, Marat Radchenko wrote:
> In short:
> 1. Hack, hack, hack
> 2. Commit
> 3. Push, woops, reject (non-ff)
> 4. Pull
> 5. Push
Just do pull --rebase? This is essentially the same as what SVN
used to do in your setup.
-Geert
--
To unsubscribe from this list: send the li
Marc Branchaud wrote:
> But I'm definitely biased because I think pull is pretty much broken:
>
> * New users are encouraged to use pull, but all too often the default
> fetch-then-merge behaviour doesn't match their expectations and they end up
> starting threads like this one on the mailing list
Hello Marat,
On Mon, Apr 28, 2014 at 10:29:07AM +0400, Marat Radchenko wrote:
> Setup:
> 20 people (programmers, artists, designers) with prior SVN
I was in a similar situation: 10 people, mostly mathematicians,
previous experience with Tortoise SVN.
I wanted to move to Git with centralized mode
Marc Branchaud writes:
> But I'm definitely biased because I think pull is pretty much broken:
>
> * New users are encouraged to use pull, but all too often the default
> fetch-then-merge behaviour doesn't match their expectations and they end up
> starting threads like this one on the mailing li
On 14-04-28 02:41 PM, Junio C Hamano wrote:
> Marat Radchenko writes:
>
>> Problem #1: TortoiseGit GUI windows for common tasks have a heck
>> lots of controls that a common Git user will never need.
>
> Do people around TortoiseGit lurk on this list? Otherwise this may
> not be something we ca
Marat Radchenko writes:
> Problem #1: TortoiseGit GUI windows for common tasks have a heck
> lots of controls that a common Git user will never need.
Do people around TortoiseGit lurk on this list? Otherwise this may
not be something we can help you with here.
> Problem #2 occured the first da
8 matches
Mail list logo
