Re: "groups of files" in Git?

From: Igor Djordjevic <igor.d.djordjevic@gmail.com>
Date: Jul 13, 2017, 23:40 UTC
Message-ID: <d91f420b-8737-0c94-5a67-f3cb24c2ba22@gmail.com>
In-Reply-To: <40292f8e-e8a9-8b7a-112f-ef4b183a6b35@gmail.com>

Eh, yet another one, sorry:

On 14/07/2017 01:32, Igor Djordjevic wrote:

Show 6 quoted lines

>     
>     $ git checkout featureA
>     $ git commit
>     $ git checkout master
>     $ git reset --hard HEAD^
>     $ git merge <HEAD@{1} parents>

The last line should stress <HEAD@{1} *parent branches*>, as we`re not merging exact parent commits the previous merge commit was made of, but updated tips of the branches the previous merge commit was made of... or something along those lines :)