[cctbxbb] Making branches by accident
luc_j_bourhis at mac.com
Thu Dec 8 10:05:50 PST 2016
> On 8 Dec 2016, at 18:41, Nigel Moriarty <nwmoriarty at lbl.gov> wrote:
> Will the commits appear in the log based on the time of the merge or the time I committed in the branch?
The latter. Commits are immutable, and eternal (unless you delete a branch of course). Then merge will create a new commit so the two branches can “meet”: that one feature the time of the merge, to state the obvious!
-------------- next part --------------
An HTML attachment was scrubbed...
More information about the cctbxbb