Hi guys,
I have been having an issue which has already occurred three times, here is my issue:
I have connected my instance to a Git repository to allow team development. The connection works fine, and I have already made multiple pushes onto the repository. The problem came a couple of days ago. One of my co-workers had finished a part of the program, so they pushed their changes onto the Git repository without errors. When he notified me of this push, I pulled the changes he had made and began working from there. After making changes (i.e. creating tables / forms / columns...) I attempted to push my changes. Before pushing, I pulled from Git to make sure I had the latest version, but after the pulling was done, when I tried to apply my stashed changes and I received this message.
Trying to fix these conflicts, I hit the back button to find myself with this issue:
I don't know why, but it tells me that there are no conflicts, but it does not let me apply my stashed changes. If I hit either take stashed changes, or take remote changes, it does not do either. Instead, it just closes this popup and whatever work I finished would be locked up in a local stash that I could not access because this would occur when attempting to apply this local stash. This has happened to me three times already, even after resetting my instance. I later found out, by making small modifications at a time, that what was causing this issue was when I would modify a form from a table that was already created and present in the Git repository.
I do not know how to go about fixing this issue, and have not found anyone with a similar issue to help me out. If anyone has any suggestions, please feel free to comment, any help is appreciated.
Thanks,
Nicolas Olvirri
.png){kind=link}
.png){kind=link}