Le 11-03-09 06:06, Richard Hipp a écrit : > > > On Tue, Mar 8, 2011 at 11:25 PM, Ron Wilson <[email protected]> wrote: > > On Tue, Mar 8, 2011 at 8:55 PM, Richard Hipp <[email protected]> wrote: > > You still haven't told me what a "fork" is. What topological pattern in the > > DAG am I looking for and reporting? > > If 2 or more children of a commit have the same branch name as the > parent, then the branch has forked. Some might call the second and > subsequent children forks. To me, they are more like pending merges. > > (where a branch could be the trunk) > > > > What if the fork has already been merged back together? Do we still > warn about forks that have already been "fixed"? >
I'm not sure to understand how those fork work. If my push produce a fork, all my following push will continue from the same fork point right? It will not merge back by itself if I don't merge explicitly? If someone else merge my change, my local repository will be out of sync anyway, so what will happens if I push in that case? -- Martin _______________________________________________ fossil-users mailing list [email protected] http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
