When performing an automerge, both parent commits must agree on a tree. It sounds like this is not the case for you perhaps you should recreate your satellite so it agrees with upstream's tree?
On Tue, May 20, 2014 at 2:45 PM, Renan Gurgel <[email protected]>wrote: > I have been finding some problem when I will make a automerge in my Gitlab > repository. After some search I have found that some of my folders are > untracked in the main repository. What´s the best approach to follow in > this situation? I can´t remove this folders and I have no ideia of how this > untracked files appear. > > -- > You received this message because you are subscribed to the Google Groups > "GitLab" group. > To unsubscribe from this group and stop receiving emails from it, send an > email to [email protected]. > To view this discussion on the web visit > https://groups.google.com/d/msgid/gitlabhq/d55b88b5-17a1-445f-833e-ad79dbe9fc27%40googlegroups.com<https://groups.google.com/d/msgid/gitlabhq/d55b88b5-17a1-445f-833e-ad79dbe9fc27%40googlegroups.com?utm_medium=email&utm_source=footer> > . > For more options, visit https://groups.google.com/d/optout. > -- You received this message because you are subscribed to the Google Groups "GitLab" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To view this discussion on the web visit https://groups.google.com/d/msgid/gitlabhq/CAGWx_yaShRCn0%3Df5bipanD%2BV1f8mOm9pnBiqV3JA0XsepppiBA%40mail.gmail.com. For more options, visit https://groups.google.com/d/optout.
