Share
Report
25Hello everyone:
I am working with this new feature and I think is great. But, today I have rare issue while working with my partner. This is the scenario:
1. We working together with no problem before lunch. I left the canvas app opened in the editor and went out. My partner continued working on the app making quite a few changes.
2. After lunch I went back to the editor, it was opened because I left in that way. So, I saw my partner made some changes and then I decided to click on the refresh button to "download" all the changes.
3. The changes download correctly but then when my partner and I get together to check the app, it seems that their changes were gone.
What I think is that when I click on the refresh button, the editor uploaded the version of the screen that I had, github do something and overwrite my partners changes and finally merge the sources and that is, changes lost. I think that because after clicking on the button, on the repository I see a SmartMerge commit.
I wanted to know, what does the refresh button really do? For what I think, it will only has to do a "git pull" and overwrite local changes to include the changes in the remote repo.
To avoid this problem, I have decided to do the following:
1. If I left the editor opened, first, close it.
2. Open the editor, enter my github credentials. When this is done, I have noticed that here, the syncronization is done by doing a "git pull" only and get all the changes. I think that because after opening the editor, on the repository I don't see a SmartMerge commit, it just pull the changes.
Hope someone can help me with this.
Thanks!
All responses (
Answers (
