Step 1. Fetch and check out the branch for this merge request
git fetch origin git checkout -b feature/#75_revisar_monto_descuento origin/feature/#75_revisar_monto_descuento
Step 2. Review the changes locally
Step 3. Merge the branch and fix any conflicts that come up
git checkout develop git merge --no-ff feature/#75_revisar_monto_descuento
Step 4. Push the result of the merge to GitLab
git push origin develop
Note that pushing to GitLab requires write access to this repository.
Tip: You can also checkout merge requests locally by following these guidelines
The changes were merged into develop. The source branch has been removed.
Added 1 commit:
Esto está bien? porque si tiene descuento, el resultado sería igual que el monto_descuento, por lo tanto parecería que se cancela.
eh, si. enrealidad lo que busco es colocar el valor en 0 cuando no aplique el descuento. La otra forma era ponerle un operador ternario cuando estoy almacenando el valor, en la columna de monto_descuento.
Status changed to merged
mentioned in commit 97b74a83
