Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
  • This project
    • Loading...
  • Sign in / Register
T
third-party
  • Overview
    • Overview
    • Details
    • Activity
    • Cycle Analytics
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
  • Issues 0
    • Issues 0
    • List
    • Board
    • Labels
    • Milestones
  • Merge Requests 1
    • Merge Requests 1
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • cooperatic-foodcoops
  • third-party
  • Merge Requests
  • !55

Closed
Opened Aug 12, 2021 by Alexis AOUN@alexis 
  • Report abuse
Report abuse

WIP: Field vide lors du scan d'un produit déjà scanné

ATTENTION : Ce MR ne doit être mergé qu'après le MR de la détection de poids à la réception.

Lors du scan d'un produit déjà scanné le field de la ligne d'édition sera vide.

×

Check out, review, and merge locally

Step 1. Fetch and check out the branch for this merge request

git fetch https://gl.cooperatic.fr/alexis/third-party.git fix_remove-qty-edition
git checkout -b alexis/third-party-fix_remove-qty-edition FETCH_HEAD

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

git checkout dev_principale
git merge --no-ff alexis/third-party-fix_remove-qty-edition

Step 4. Push the result of the merge to GitLab

git push origin dev_principale

Note that pushing to GitLab requires write access to this repository.

Tip: You can also checkout merge requests locally by following these guidelines.

  • Discussion 1
  • Commits 2
  • Pipelines 1
  • Changes 1
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Damien Moulard @DamienM commented Jan 18, 2022
    Developer

    Fusionnée : Modifications apportées en local pour éviter les conflits de merge.

    Fusionnée : Modifications apportées en local pour éviter les conflits de merge.
  • Damien Moulard @DamienM

    closed

    Jan 18, 2022

    closed

    closed
    Toggle commit list
  • Write
  • Preview
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment
Assignee
No assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
Reference: cooperatic-foodcoops/third-party!55