gatewayEdit 2.1
v2.1 Release Notes
What’s New:
We are pleased to announce that gatewayEdit 2.1 is now officially released and is available online at https://gatewayedit.com with Merge functionality.
Key Features:
- Users would be able to merge changes from their User branch to Master branch and also update their existing User branch with the latest content from the Master branch #399
- Performance improvement on Save after editing scripture. #533
Bug fixes:
- Alignment of the whole verse would not break after an edit is made to the scripture. #520
- There would be a smooth navigation on switching between books from New and Old Testament and Scripture overwrite would not happen #514
Note: After the upgrade if you find that your screen layout is distorted, please use the menu item Reset Resource Layout to fix the screen.
IMPORTANT NOTE FOR DEVELOPERS
Due to the main and develop branches being out of sync, the develop branch had to be rebased with the relevant changes from master.
This means that if you have done work off of develop, your commit history is most likely different from the new commit history! So, you will have to rebase whatever current work you have with the develop branch! See steps below:
- Create a copy of your branch as a backup in case something goes wrong
git branch backup-branch - Make sure you are in your feature branch, and then run the rebase command to incorporate the changes from develop
git rebase origin/develop - This may be a long process, but solve any merge conflicts for each commit and after resolving run
git rebase --continue - Repeat this process until the rebase is finished. At the end, your branch should now contain the commit history contained in develop along with your changes (your changes should be after the develop commits)
For Further Info: Notes on Rebasing