asterixdb-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Chen Li <>
Subject Re: Merging vs. squashing
Date Thu, 24 Sep 2015 06:38:03 GMT
Just want to echo what Ted said: if the same commit exists in two
different branches, then there is no issue when we merge these two
branches into the master.  In fact, if branch A has all the commits of
branch B, after we merge branch A into the master, git will
automatically think branch B is already merged into the master.


View raw message