Merging frontend changes to backend
added the ff -base html -login screen
- record list screen
added the ff -base html -login screen
Step 1. Fetch and check out the branch for this merge request
git fetch origin git checkout -b espedido origin/espedido
Step 2. Review the changes locally
Step 3. Merge the branch and fix any conflicts that come up
git fetch origin git checkout origin/205450 git merge --no-ff espedido
Step 4. Push the result of the merge to GitLab
git push origin 205450
Note that pushing to GitLab requires write access to this repository.
Tip: You can also checkout merge requests locally by following these guidelines.
This will create a new commit in order to revert the existing changes.