I've been mildly bitten by this behavior before. When merging from a branch
a warning that you haven't sync'd would be a nice to have. Autosync prior
to merge would work for me but the warning would be a decent alternative.

On Thu, Oct 9, 2014 at 12:43 PM, Richard Hipp <d...@sqlite.org> wrote:

> I just did a "fossil merge $BRANCH" for some changes that a colleague
> checked in, and was puzzled to not see much change in the code.  After I
> while, I finally figured out that I should have do "fossil pull" first.  :-\
>
> I wonder if we should auto-pull before "merge" the same as we do before
> "update"?
>
> --
> D. Richard Hipp
> d...@sqlite.org
>
> _______________________________________________
> fossil-users mailing list
> fossil-users@lists.fossil-scm.org
> http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
>
>


-- 
Matt
-=-
90% of the nations wealth is held by 2% of the people. Bummer to be in the
majority...
_______________________________________________
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users

Reply via email to