correction for the bug due to the name of the function end()

[LucasMahieu]

This is the pull request solving the issues #61 "publish error in "end()" function".
Juste rename the begin() and end() function to begin_frame() and end_frame().

[Overdrivr]

Thanks for this PR

Could you replace begin by begin_frame and end by end_frame in the tests as well ?

[Overdrivr]

Could you rebase the commits into a single one ?
Use message for this commit

Rename end() function to avoid potential duplicate with linker symbol

To do that, rebase against laster master commit

git rebase -i 2476df8

This will open a text file with all 4 commits. prefix the first commit with reword and the others with fixup. Save the file and close it.

Git will then open a second text file with the commit message for the first commit. Replace it with the message provided above here. Save the file, close it.

Rebase should complete fine at this point.

Do a force push to push the changes to this remote repo, with this command

git push origin end_bug --force

I'll merge the PR afterwards

Thanks !

[LucasMahieu]

This is done, thanks for your attention about this PR ---------------------------------- Lucas MAHIEU [email protected]

…

On 14 Dec 2016, at 10:32, Rémi Bèges ***@***.***> wrote: Could you rebase the commits into a single one ? Use message for this commit Rename end() function to avoid potential duplicate with linker symbol To do that, rebase against laster master commit git rebase -i 2476df8 This will open a text file with all 4 commits. prefix the first commit with reword and the others with fixup. Save the file and close it. Git will then open a second text file with the commit message for the first commit. Replace it with the message provided above here. Save the file, close it. Rebase should complete fine at this point. Do a force push to push the changes to this remote repo, with this command git push origin end_bug --force I'll merge the PR afterwards Thanks ! — You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub <#62 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/ALc1oFEYw-6qdL1tXpDNOpCq1eTIYDfXks5rH7fBgaJpZM4LKR03>.

[Overdrivr]

There is something weird, the modifications in the test files are gone, are you sure the rebase executed properly ?

[LucasMahieu]

I did exactly what your last mail explained. I will see the problem and push again. ---------------------------------- Lucas MAHIEU [email protected]

…

On 14 Dec 2016, at 14:48, Rémi Bèges ***@***.***> wrote: There is something weird, the modifications in the test files are gone, are you sure the rebase executed properly ? — You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub <#62 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/ALc1oNGXVYK4UwxTG9j-heEPzbHBryWMks5rH_O9gaJpZM4LKR03>.

[Overdrivr]

It's strange, rebasing should never drop commits like that

[LucasMahieu]

is it better now ? I pushed the right version ---------------------------------- Lucas MAHIEU [email protected]

…

On 14 Dec 2016, at 15:20, Rémi Bèges ***@***.***> wrote: It's strange, rebasing should never drop commits like that — You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub <#62 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/ALc1oJ_JGNQWb8zIDi1_1rcDpMYRH1-Kks5rH_sjgaJpZM4LKR03>.

[Overdrivr]

Code is good, but we're back to square one for the git history.

I don't know why you're getting those commit messages Merge branch 'end_bug' of github.com:LucasMahieu/Telemetry into end_bug.

It seems that there were differences between your local version of end_bug and the remote version (the one on github.com), and git had to make a non fast-forward merge.

[LucasMahieu]

Yes, I noticed this marge, and i don’t understand the reason … —————————— Lucas MAHIEU [email protected]

…

On 14 Dec 2016, at 15:27, Rémi Bèges ***@***.***> wrote: Code is good, but we're back to square one for the git history. I don't know why you're getting those commit messages Merge branch 'end_bug' of github.com:LucasMahieu/Telemetry into end_bug. It seems that there were differences between your local version of end_bug and the remote version (the one on github.com), and git had to make a non fast-forward merge. — You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub <#62 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/ALc1oHL4yYA1X1hpiz6mVZxNbCs0gZAbks5rH_zlgaJpZM4LKR03>.

[Overdrivr]

Did you make a git pull after the rebase ?

[LucasMahieu]

euh.. Oh yes, because git did’t want that I push and tell me to pull before push. I think this is the reason. I should have make a "push —force" ---------------------------------- Lucas MAHIEU [email protected]

…

On 14 Dec 2016, at 15:31, Rémi Bèges ***@***.***> wrote: Did you make a git pull after the rebase ? — You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub <#62 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/ALc1oPIeiwhLRh2XRkq9MU61FQtqHoUtks5rH_3DgaJpZM4LKR03>.

[Overdrivr]

Allright good, please rebase again but force push this time.

This pull is why you lost the latest modifications I think

[LucasMahieu]

Can you tel me if this history is good enough for you ? ---------------------------------- Lucas MAHIEU [email protected]

…

On 14 Dec 2016, at 15:35, Rémi Bèges ***@***.***> wrote: Allright good, please rebase again but force push this time. This pull is why you lost the latest modifications I think — You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub <#62 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/ALc1oHxgOhurzNetBwMhNCFeUNzaBMLCks5rH_7EgaJpZM4LKR03>.

[Overdrivr]

Damn, the last commit was lost again. I really don't know how this is possible, git is particularly good at ensuring that no matter what you do, code changes should never be lost.

Just push the changes in another commit and I will merge.
I wanted to keep history clean but whatever

[LucasMahieu]

I think it is good right now ? I really don’t understand too why, but I forced and marge the two last commit. It should be good now.

…

---------------------------------- Lucas MAHIEU [email protected]

On 14 Dec 2016, at 15:47, Rémi Bèges ***@***.***> wrote: Damn, the last commit was lost again. I really don't know how this is possible, git is particularly good at ensuring that no matter what you do, code changes should never be lost. Just push the changes in another commit and I will merge. I wanted to keep history clean but whatever — You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub <#62 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/ALc1oHFS2eUT0ZU4VCUIx2EQ1Mx1ZwKqks5rIAGKgaJpZM4LKR03>.

[Overdrivr]

Can you go on Gitter right now ? It's still not good