[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Git transition workflow

From: Stefan Monnier
Subject: Re: Git transition workflow
Date: Wed, 13 Aug 2014 11:59:50 -0400
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/24.4.50 (gnu/linux)

>> There's one big difference here: in the merge case, all the state is
>> directly visible in the files,
> Not exactly, as staging area does have some hidden state.  That's why you
> need to "git add" a file after you resolve conflicts (unlike CVS).

Right, but that's only metadata.  In contrast in the rebase case, the
hidden info can include actual textual changes you've made to the files
(which have been temporarily removed, and will be (hopefully) reapplied
after (some number of) "git rebase --continue").


reply via email to

[Prev in Thread] Current Thread [Next in Thread]