Skip to content
GitLab
Projects Groups Snippets
  • /
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Sign in / Register
  • openairinterface5G openairinterface5G
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
  • Issues 67
    • Issues 67
    • List
    • Boards
    • Service Desk
    • Milestones
  • Merge requests 52
    • Merge requests 52
  • Deployments
    • Deployments
    • Releases
  • Monitor
    • Monitor
    • Incidents
  • Analytics
    • Analytics
    • Value stream
    • Repository
  • Wiki
    • Wiki
  • Activity
  • Graph
  • Create a new issue
  • Commits
  • Issue Boards
Collapse sidebar
  • oaioai
  • openairinterface5Gopenairinterface5G
  • Merge requests
  • !400

Astyle integration test3

  • Review changes

  • Download
  • Email patches
  • Plain diff
Closed Raphael Defosseux requested to merge astyle_integration_test3 into develop Sep 26, 2018
  • Overview 4
  • Commits 27
  • Pipelines 0
  • Changes 65

This is a test on how to astyle and merge to validate the process.

I've integrated 4 pending MRs:

  • First I've astyled in each branch with the CI astyle option files the files that are been modified by the MR

  • Then I merge into the integration using git merge -s recursive -Xdiff-algorithm=histogram src_branch command

There were merge conflicts but they were quite trivial.

Compared to MR 399, I made one different choice on a merge

Assignee
Assign to
Reviewers
Request review from
Time tracking
Source branch: astyle_integration_test3