I’ve just read through the new Git articles. Thanks @Teodor - they’re very clear and helpful. I have a couple of questions.
If I’m working on a file, I can use the branch dropdown to switch between the current branch version and the master and vice versa. However, having swiched in this way, I can’t edit the version I’ve switched to - I have to close the file and reopen it. As I can see the version I want to edit, I assumed I could then edit but I can’t. Is this as expected or am I doing something incorrectly. (I have little experience with Git.)
Also, if there is merge conflict, Wappler indicates this in a message. Is it possible to see details of the conflict or is it just a matter of comparing the files? I think George mentioned some time ago the possibility of being able to compare files, using Git’s diff feature presumably. Perhaps this will be added in the future (unless it’s already there somewhere).
Last updated: