tech-repository archive

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

Re: irt: Re: Core statement on version control systems



>  > >  :: - storing the identity of long-running branches in the history
>  > >  :
>  > >  : Can you expand on this?
>  > >
>  > > In git, you can find the merge commit, and it has two ancestors, and
>  > > there's a diamond in the commit graph. But you can't tell from the
>  > > repository metadata which side of the diamond was the trunk and which
>  > > was the development branch. You have to read and interpret the commit
>  > > messages. You also can't tell which development branch it was.
>  >
>  > I would just say that's what tags are for.  :-)
>
> You can, but it's messy and you shouldn't have to.

It's trivial.  It's the first hash.

If it isn't, someone snafu'd and forgot to block fox-trot merges in
the shared repo.
See https://www.atlassian.com/blog/it-teams/stop-foxtrots-now and
https://stackoverflow.com/questions/35962754/git-how-can-i-prevent-foxtrot-merges-in-my-master-branch/35962849#35962849


Home | Main Index | Thread Index | Old Index