| 1 |
Consider that I am the village idiot, you have to explain to me how you |
| 2 |
integrated the two branches that each had a commit that the other didn’t |
| 3 |
have. |
| 4 |
|
| 5 |
François |
| 6 |
|
| 7 |
On 2/07/2014, at 23:16, Jauhien Piatlicki <jauhien@g.o> wrote: |
| 8 |
|
| 9 |
> Hi François, |
| 10 |
> |
| 11 |
> On 07/02/2014 12:40 PM, François Bissey wrote: |
| 12 |
>> Hi, |
| 13 |
>> |
| 14 |
>> The overlay are out of sync again. When jlec merged pynomo |
| 15 |
>> earlier today it wasn’t pushed to the Gentoo overlay for a reason |
| 16 |
>> or another. |
| 17 |
>> And then I pushed a minor keywording for x64-macos and it did |
| 18 |
>> go on the Gentoo overlay but not on github. |
| 19 |
>> |
| 20 |
>> I cannot remember how to resolve the problem, do we have documentation |
| 21 |
>> elsewhere than on the mailing list in post several years old for that? |
| 22 |
>> |
| 23 |
> |
| 24 |
> Resolved. Just merged the changes as we anyway use merges working with |
| 25 |
> pull requests. I mean, our git process is based on merges, so merging |
| 26 |
> unsynced branches does not create problems. |
| 27 |
> |
| 28 |
> Regards, |
| 29 |
> Jauhien |
| 30 |
> |
Archives