Consider that I am the village idiot, you have to explain to me how you integrated the two branches that each had a commit that the other didn’t have.
François On 2/07/2014, at 23:16, Jauhien Piatlicki <[email protected]> wrote: > Hi François, > > On 07/02/2014 12:40 PM, François Bissey wrote: >> Hi, >> >> The overlay are out of sync again. When jlec merged pynomo >> earlier today it wasn’t pushed to the Gentoo overlay for a reason >> or another. >> And then I pushed a minor keywording for x64-macos and it did >> go on the Gentoo overlay but not on github. >> >> I cannot remember how to resolve the problem, do we have documentation >> elsewhere than on the mailing list in post several years old for that? >> > > Resolved. Just merged the changes as we anyway use merges working with > pull requests. I mean, our git process is based on merges, so merging > unsynced branches does not create problems. > > Regards, > Jauhien >
