[{"data":1,"prerenderedAt":787},["ShallowReactive",2],{"/en-us/blog/resolving-merge-conflicts-from-the-gitlab-ui":3,"navigation-en-us":33,"banner-en-us":432,"footer-en-us":442,"blog-post-authors-en-us-Sean McGivern":684,"blog-related-posts-en-us-resolving-merge-conflicts-from-the-gitlab-ui":699,"assessment-promotions-en-us":738,"next-steps-en-us":777},{"id":4,"title":5,"authorSlugs":6,"body":8,"categorySlug":9,"config":10,"content":14,"description":8,"extension":22,"isFeatured":12,"meta":23,"navigation":24,"path":25,"publishedDate":20,"seo":26,"stem":30,"tagSlugs":31,"__hash__":32},"blogPosts/en-us/blog/resolving-merge-conflicts-from-the-gitlab-ui.yml","Resolving Merge Conflicts From The Gitlab Ui",[7],"sean-mcgivern",null,"company",{"slug":11,"featured":12,"template":13},"resolving-merge-conflicts-from-the-gitlab-ui",false,"BlogPost",{"title":15,"description":16,"authors":17,"heroImage":19,"date":20,"body":21,"category":9},"Resolving Merge Conflicts from the GitLab UI","Learn how GitLab's merge conflict resolution feature works and why we introduced it.",[18],"Sean McGivern","https://res.cloudinary.com/about-gitlab-com/image/upload/v1749666760/Blog/Hero%20Images/merge-conflicts.png","2016-09-06","Merge conflicts can be very annoying for both merge request authors and\nreviewers. As an author, I just want my merge request to be merged. But the\nreviewer might not be in the same time zone as me and by the time they review\nmy changes, I have a merge conflict. I then need to fix it and pass the merge\nrequest back to them, which is a lot of busy work for something that could be\nfairly trivial to fix.\n\nSimilarly, as a reviewer, I want merge requests to be accepted when they're\nready. I don't want to spend my time checking out the author's branch, fixing\nthe conflicts, and pushing back; and I don't particularly like waiting around\nfor them to fix it. As an author or a reviewer, I just want to be able to have\nthe merge request accepted, and move on to the next thing. That's why understanding the methods of resolving conflicts is crucial. Fortunately, GitLab has a few ways of resolving conflicts from the GitLab UI.\n\nIn GitLab 8.11, we\n[introduced the ability to resolve merge conflicts in the UI][release-post]. This\npost describes the background for the feature, how it works, and what we're\nplanning to do next with it.\n\n\u003C!-- more -->\n\n## What is a merge conflict?\n\nA merge conflict is when a merge can't be performed cleanly between two versions\nof the same file. An error message\nmay appear, indicating the conflict is too complex.\n\n### Wait, what's a merge?\n\nA merge is a way of combining two sets of changes made in different branches. In\nGitLab, we handle this with [Merge Requests][mr], which are requests to merge\nthe changes we've made to a file (or a group of files), from a [feature\nbranch][fb] into another branch, for example, `master`.\n\nWhen the merge request is merged, the changes from `new-feature` are added to\n`master`. This happens by looking at all of the changes made in the `master` branch since\nthe `new-feature` branch was created, and all the changes made in `new-feature`,\nand applying them to the files changed.\n\nMost of the time, Git can do this automatically, but sometimes it can't. For\ninstance, if we changed a line of code in our `new-feature` branch, but that line was\nalso changed in `master`, Git doesn't know which line to accept. When this happens, someone needs to manually tell Git which line\nto use, which creates a **merge conflict**.\n\n**Note:** for this post, we will just concentrate on conflicts within a file. However,\nrenames and deletions can also cause conflicts, and we\n[plan on supporting those][20665] in the future.\n\n\n## Why are merge conflicts a problem?\n\nThey're really annoying!\n\nWhen there's a conflict in a [version control](/topics/version-control/) system, a merge request can't be merged without manual\nintervention.\n\nIf you can't resolve complex merge conflicts within GitLab, that means that any merge\nrequest with a conflict needs to be checked out locally, resolved locally,\npushed back, and merged. That's a hassle and can't be done without having some\nGit tools installed locally. At GitLab, we want\n[everyone to be able to collaborate on all digital content][vision], and that\nmeans not having to install special tools whenever possible.\n\n### Types of conflict resolution\n\nThere are several methods of resolving conflicts:\n\n1. Just pick one version, and use that. This is often the case with generated\n   files. One example is the [`schema.rb`][schema-rb] file in a Rails app.\n   Conflicts on the schema version line are common, but we (almost) always want\n   the latest version.\n\n2. Keep the lines of code from both versions. A great example of this is the\n   [GitLab CE CHANGELOG file][changelog], which is a\n   [frequent source of merge conflicts][changelog-crisis]. We're working on\n   [tooling to help with this][automated-changelogs], but that's specific to\n   GitLab rather than applicable to every project.\n\n3. Write our own resolution. For instance, if we started with the sentence:\n\n    > There are two versions of GitLab: CE and EE\n\n    I might think that those acronyms should be spelled out:\n\n    > There are two versions of GitLab: Community Edition (CE) and Enterprise Edition (EE)\n\n    And you might think that the sentence needs some closing punctuation:\n\n    > There are two versions of GitLab: CE and EE.\n\n    Because conflicts are based on lines, there's no way to automatically pick\n    both of those changes. We can do so manually, though:\n\n    > There are two versions of GitLab: Community Edition (CE) and Enterprise Edition (EE).\n\nAt present, the conflict resolution support in GitLab is only really useful for\nresolving the first type of conflict. The [merge conflict resolution editor](https://gitlab.pavlovia.org/help/user/project/merge_requests/resolve_conflicts.md) allows for more complex [conflicts](https://docs.gitlab.com/ee/user/project/merge_requests/conflicts.html) to be resolved by manually modifying a file from the GitLab interface.\n\n## How do we resolve them?\n\nWhen a merge request can have its conflicts resolved within GitLab, it will have\na link within the merge box to 'resolve these conflicts':\n\n![The 'resolve these conflicts' link on a merge request](https://about.gitlab.com/images/blogimages/resolving-merge-conflicts-from-the-gitlab-ui/mr-widget.png){: .shadow}\n\nClicking that link will show a list of files with conflicts, with conflict sections\nhighlighted as 'our changes' (the changes in the merge request's source branch)\nand 'their changes' (the changes in the merge request's target branch):\n\n![Some example merge conflicts](https://about.gitlab.com/images/blogimages/resolving-merge-conflicts-from-the-gitlab-ui/merge-conflicts.png){: .shadow}\n\nHere's an example of a more complex merge conflict in a `schema.rb` that I resolved on the GitLab CE\nproject:\n\n![Resolving a merge conflict](https://about.gitlab.com/images/8_11/resolve_mc.gif)\n\n### How does that work?\n\nThe current implementation, at a high level, works like this:\n\n1. If a merge request has conflicts, GitLab gets a list of the\n   [files with merge conflicts][rugged-conflicts].\n2. For each file, it then\n   [generates a merged file with conflict markers][rugged-merge-file].\n3. GitLab parses those conflict markers out and presents them to the UI as\n   sections: context, our side of the conflict, their side of the conflict,\n   context, etc.\n4. When the UI passes the section IDs back, we do the same thing. This time,\n   GitLab only keeps the sections the user selected, along with all context\n   sections.\n5. GitLab joins the resolved lines together to create a resolved file, and\n   [adds it to the Git index][rugged-add].\n6. Finally, we write that index as a merge commit to the source branch.\n\nIf the source branch is `new-feature` and the target branch is `master`, then\nthis does basically the same thing as running:\n\n```shell\ngit checkout new-feature\ngit merge master\n```\n\n### Why can't some conflicts be resolved in GitLab?\n\nThe implementation above produces a number of constraints (for the most\nup-to-date list, please see the\n[merge conflict resolution documentation](https://docs.gitlab.com/ee/user/project/merge_requests/conflicts.html):\n\n1. If the file contains conflict markers that mean we can't parse the file contents\n   unambiguously, we can't show the sections. We will, however, be able to allow\n   [resolving those conflicts in an editor](#an-editor).\n2. If the file is a binary file, we can't parse the file for conflict markers\n   because they are only added to text files. Again, we plan to\n   [allow resolving conflicts in binary files](#binary-files) in the future.\n3. If the file [isn't in a UTF-8 compatible encoding][21247], we can't allow\n   resolving it because we pass data back and forth as JSON.\n4. If the file is too large (over 200 KB), we avoid parsing it.\n\nBecause all conflicts must be resolved at once, if any of the conflicts for a\nmerge request can't be resolved in the GitLab UI, then the conflicts must be\nresolved manually.\n\n## What's next?\n\nThere are plenty of places for improving our current implementation, and we'd\nlove to hear of ones we haven't thought of. Here are three obvious ones already\nin our [issue tracker][ce-issues].\n\n### An inline editor!\n\nThe most obvious improvement is to allow\n[editing the conflict resolution][20344]. This is closer to the experience on\nthe command line, with the conflict markers present in the file. It will also\ncover most of the problem cases listed above with the current approach.\n\n### Binary files!\n\nIn addition to this, as binary files are typically not manually mergeable, we\ncould just [show both file versions][20664], and ask which one to use. This will work\nbest for images, but can support all binary files.\n\n### Renames!\n\nIncompatible renames are detected as conflicts by the `git` command line tool,\nbut not by the library we use at GitLab. We can [detect rename conflicts][20345]\nourselves, it's just more work.\n\n**For the latest information on how to resolve merge conflicts in GitLab, check out our [documentation](https://docs.gitlab.com/ee/user/project/merge_requests/conflicts.html).**\n\n[20344]: https://gitlab.com/gitlab-org/gitlab-ce/issues/20344\n[20345]: https://gitlab.com/gitlab-org/gitlab-ce/issues/20345\n[20664]: https://gitlab.com/gitlab-org/gitlab-ce/issues/20664\n[20665]: https://gitlab.com/gitlab-org/gitlab-ce/issues/20665\n[21247]: https://gitlab.com/gitlab-org/gitlab-ce/issues/21247\n[automated-changelogs]: https://gitlab.com/gitlab-org/release-tools/merge_requests/29\n[ce-issues]: https://gitlab.com/gitlab-org/gitlab-ce/issues\n[changelog-crisis]: https://gitlab.com/gitlab-org/gitlab-ce/issues/17826\n[changelog]: https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md\n[conflict-docs]: https://docs.gitlab.com/ee/user/project/merge_requests/resolve_conflicts.html\n[release-post]: /releases/2016/08/22/gitlab-8-11-released/#merge-conflict-resolution\n[rugged-add]: http://www.rubydoc.info/github/libgit2/rugged/Rugged/Index#add-instance_method\n[rugged-conflicts]: http://www.rubydoc.info/github/libgit2/rugged/Rugged/Index#conflicts-instance_method\n[rugged-merge-file]: http://www.rubydoc.info/github/libgit2/rugged/Rugged/Index#merge_file-instance_method\n[schema-rb]: http://guides.rubyonrails.org/active_record_migrations.html#what-are-schema-files-for-questionmark\n[vision]: /direction/#vision\n[fb]: https://docs.gitlab.com/ee/gitlab-basics/feature_branch_workflow.html\n[mr]: http://doc.gitlab.com/ce/user/project/merge_requests.html\n","yml",{},true,"/en-us/blog/resolving-merge-conflicts-from-the-gitlab-ui",{"title":15,"description":16,"ogTitle":15,"ogDescription":16,"noIndex":12,"ogImage":19,"ogUrl":27,"ogSiteName":28,"ogType":29,"canonicalUrls":27},"https://about.gitlab.com/blog/resolving-merge-conflicts-from-the-gitlab-ui","https://about.gitlab.com","article","en-us/blog/resolving-merge-conflicts-from-the-gitlab-ui",[],"LzJXf54BXX9D-awUkShZ6qQBR4xm5ZdePDx2fAfNUA4",{"data":34},{"logo":35,"freeTrial":40,"sales":45,"login":50,"items":55,"search":362,"minimal":393,"duo":412,"pricingDeployment":422},{"config":36},{"href":37,"dataGaName":38,"dataGaLocation":39},"/","gitlab logo","header",{"text":41,"config":42},"Get free trial",{"href":43,"dataGaName":44,"dataGaLocation":39},"https://gitlab.com/-/trial_registrations/new?glm_source=about.gitlab.com&glm_content=default-saas-trial/","free trial",{"text":46,"config":47},"Talk to sales",{"href":48,"dataGaName":49,"dataGaLocation":39},"/sales/","sales",{"text":51,"config":52},"Sign in",{"href":53,"dataGaName":54,"dataGaLocation":39},"https://gitlab.com/users/sign_in/","sign in",[56,83,178,183,284,343],{"text":57,"config":58,"cards":60},"Platform",{"dataNavLevelOne":59},"platform",[61,67,75],{"title":57,"description":62,"link":63},"The intelligent orchestration platform for DevSecOps",{"text":64,"config":65},"Explore our Platform",{"href":66,"dataGaName":59,"dataGaLocation":39},"/platform/",{"title":68,"description":69,"link":70},"GitLab Duo Agent Platform","Agentic AI for the entire software lifecycle",{"text":71,"config":72},"Meet GitLab Duo",{"href":73,"dataGaName":74,"dataGaLocation":39},"/gitlab-duo-agent-platform/","gitlab duo agent platform",{"title":76,"description":77,"link":78},"Why GitLab","See the top reasons enterprises choose GitLab",{"text":79,"config":80},"Learn more",{"href":81,"dataGaName":82,"dataGaLocation":39},"/why-gitlab/","why gitlab",{"text":84,"left":24,"config":85,"link":87,"lists":91,"footer":160},"Product",{"dataNavLevelOne":86},"solutions",{"text":88,"config":89},"View all Solutions",{"href":90,"dataGaName":86,"dataGaLocation":39},"/solutions/",[92,116,139],{"title":93,"description":94,"link":95,"items":100},"Automation","CI/CD and automation to accelerate deployment",{"config":96},{"icon":97,"href":98,"dataGaName":99,"dataGaLocation":39},"AutomatedCodeAlt","/solutions/delivery-automation/","automated software delivery",[101,105,108,112],{"text":102,"config":103},"CI/CD",{"href":104,"dataGaLocation":39,"dataGaName":102},"/solutions/continuous-integration/",{"text":68,"config":106},{"href":73,"dataGaLocation":39,"dataGaName":107},"gitlab duo agent platform - product menu",{"text":109,"config":110},"Source Code Management",{"href":111,"dataGaLocation":39,"dataGaName":109},"/solutions/source-code-management/",{"text":113,"config":114},"Automated Software Delivery",{"href":98,"dataGaLocation":39,"dataGaName":115},"Automated software delivery",{"title":117,"description":118,"link":119,"items":124},"Security","Deliver code faster without compromising security",{"config":120},{"href":121,"dataGaName":122,"dataGaLocation":39,"icon":123},"/solutions/application-security-testing/","security and compliance","ShieldCheckLight",[125,129,134],{"text":126,"config":127},"Application Security Testing",{"href":121,"dataGaName":128,"dataGaLocation":39},"Application security testing",{"text":130,"config":131},"Software Supply Chain Security",{"href":132,"dataGaLocation":39,"dataGaName":133},"/solutions/supply-chain/","Software supply chain security",{"text":135,"config":136},"Software Compliance",{"href":137,"dataGaName":138,"dataGaLocation":39},"/solutions/software-compliance/","software compliance",{"title":140,"link":141,"items":146},"Measurement",{"config":142},{"icon":143,"href":144,"dataGaName":145,"dataGaLocation":39},"DigitalTransformation","/solutions/visibility-measurement/","visibility and measurement",[147,151,155],{"text":148,"config":149},"Visibility & Measurement",{"href":144,"dataGaLocation":39,"dataGaName":150},"Visibility and Measurement",{"text":152,"config":153},"Value Stream Management",{"href":154,"dataGaLocation":39,"dataGaName":152},"/solutions/value-stream-management/",{"text":156,"config":157},"Analytics & Insights",{"href":158,"dataGaLocation":39,"dataGaName":159},"/solutions/analytics-and-insights/","Analytics and insights",{"title":161,"items":162},"GitLab for",[163,168,173],{"text":164,"config":165},"Enterprise",{"href":166,"dataGaLocation":39,"dataGaName":167},"/enterprise/","enterprise",{"text":169,"config":170},"Small Business",{"href":171,"dataGaLocation":39,"dataGaName":172},"/small-business/","small business",{"text":174,"config":175},"Public Sector",{"href":176,"dataGaLocation":39,"dataGaName":177},"/solutions/public-sector/","public sector",{"text":179,"config":180},"Pricing",{"href":181,"dataGaName":182,"dataGaLocation":39,"dataNavLevelOne":182},"/pricing/","pricing",{"text":184,"config":185,"link":187,"lists":191,"feature":271},"Resources",{"dataNavLevelOne":186},"resources",{"text":188,"config":189},"View all resources",{"href":190,"dataGaName":186,"dataGaLocation":39},"/resources/",[192,225,243],{"title":193,"items":194},"Getting started",[195,200,205,210,215,220],{"text":196,"config":197},"Install",{"href":198,"dataGaName":199,"dataGaLocation":39},"/install/","install",{"text":201,"config":202},"Quick start guides",{"href":203,"dataGaName":204,"dataGaLocation":39},"/get-started/","quick setup checklists",{"text":206,"config":207},"Learn",{"href":208,"dataGaLocation":39,"dataGaName":209},"https://university.gitlab.com/","learn",{"text":211,"config":212},"Product documentation",{"href":213,"dataGaName":214,"dataGaLocation":39},"https://docs.gitlab.com/","product documentation",{"text":216,"config":217},"Best practice videos",{"href":218,"dataGaName":219,"dataGaLocation":39},"/getting-started-videos/","best practice videos",{"text":221,"config":222},"Integrations",{"href":223,"dataGaName":224,"dataGaLocation":39},"/integrations/","integrations",{"title":226,"items":227},"Discover",[228,233,238],{"text":229,"config":230},"Customer success stories",{"href":231,"dataGaName":232,"dataGaLocation":39},"/customers/","customer success stories",{"text":234,"config":235},"Blog",{"href":236,"dataGaName":237,"dataGaLocation":39},"/blog/","blog",{"text":239,"config":240},"Remote",{"href":241,"dataGaName":242,"dataGaLocation":39},"https://handbook.gitlab.com/handbook/company/culture/all-remote/","remote",{"title":244,"items":245},"Connect",[246,251,256,261,266],{"text":247,"config":248},"GitLab Services",{"href":249,"dataGaName":250,"dataGaLocation":39},"/services/","services",{"text":252,"config":253},"Community",{"href":254,"dataGaName":255,"dataGaLocation":39},"/community/","community",{"text":257,"config":258},"Forum",{"href":259,"dataGaName":260,"dataGaLocation":39},"https://forum.gitlab.com/","forum",{"text":262,"config":263},"Events",{"href":264,"dataGaName":265,"dataGaLocation":39},"/events/","events",{"text":267,"config":268},"Partners",{"href":269,"dataGaName":270,"dataGaLocation":39},"/partners/","partners",{"backgroundColor":272,"textColor":273,"text":274,"image":275,"link":279},"#2f2a6b","#fff","Insights for the future of software development",{"altText":276,"config":277},"the source promo card",{"src":278},"https://res.cloudinary.com/about-gitlab-com/image/upload/v1758208064/dzl0dbift9xdizyelkk4.svg",{"text":280,"config":281},"Read the latest",{"href":282,"dataGaName":283,"dataGaLocation":39},"/the-source/","the source",{"text":285,"config":286,"lists":287},"Company",{"dataNavLevelOne":9},[288],{"items":289},[290,295,301,303,308,313,318,323,328,333,338],{"text":291,"config":292},"About",{"href":293,"dataGaName":294,"dataGaLocation":39},"/company/","about",{"text":296,"config":297,"footerGa":300},"Jobs",{"href":298,"dataGaName":299,"dataGaLocation":39},"/jobs/","jobs",{"dataGaName":299},{"text":262,"config":302},{"href":264,"dataGaName":265,"dataGaLocation":39},{"text":304,"config":305},"Leadership",{"href":306,"dataGaName":307,"dataGaLocation":39},"/company/team/e-group/","leadership",{"text":309,"config":310},"Team",{"href":311,"dataGaName":312,"dataGaLocation":39},"/company/team/","team",{"text":314,"config":315},"Handbook",{"href":316,"dataGaName":317,"dataGaLocation":39},"https://handbook.gitlab.com/","handbook",{"text":319,"config":320},"Investor relations",{"href":321,"dataGaName":322,"dataGaLocation":39},"https://ir.gitlab.com/","investor relations",{"text":324,"config":325},"Trust Center",{"href":326,"dataGaName":327,"dataGaLocation":39},"/security/","trust center",{"text":329,"config":330},"AI Transparency Center",{"href":331,"dataGaName":332,"dataGaLocation":39},"/ai-transparency-center/","ai transparency center",{"text":334,"config":335},"Newsletter",{"href":336,"dataGaName":337,"dataGaLocation":39},"/company/contact/#contact-forms","newsletter",{"text":339,"config":340},"Press",{"href":341,"dataGaName":342,"dataGaLocation":39},"/press/","press",{"text":344,"config":345,"lists":346},"Contact us",{"dataNavLevelOne":9},[347],{"items":348},[349,352,357],{"text":46,"config":350},{"href":48,"dataGaName":351,"dataGaLocation":39},"talk to sales",{"text":353,"config":354},"Support portal",{"href":355,"dataGaName":356,"dataGaLocation":39},"https://support.gitlab.com","support portal",{"text":358,"config":359},"Customer portal",{"href":360,"dataGaName":361,"dataGaLocation":39},"https://customers.gitlab.com/customers/sign_in/","customer portal",{"close":363,"login":364,"suggestions":371},"Close",{"text":365,"link":366},"To search repositories and projects, login to",{"text":367,"config":368},"gitlab.com",{"href":53,"dataGaName":369,"dataGaLocation":370},"search login","search",{"text":372,"default":373},"Suggestions",[374,376,380,382,386,390],{"text":68,"config":375},{"href":73,"dataGaName":68,"dataGaLocation":370},{"text":377,"config":378},"Code Suggestions (AI)",{"href":379,"dataGaName":377,"dataGaLocation":370},"/solutions/code-suggestions/",{"text":102,"config":381},{"href":104,"dataGaName":102,"dataGaLocation":370},{"text":383,"config":384},"GitLab on AWS",{"href":385,"dataGaName":383,"dataGaLocation":370},"/partners/technology-partners/aws/",{"text":387,"config":388},"GitLab on Google Cloud",{"href":389,"dataGaName":387,"dataGaLocation":370},"/partners/technology-partners/google-cloud-platform/",{"text":391,"config":392},"Why GitLab?",{"href":81,"dataGaName":391,"dataGaLocation":370},{"freeTrial":394,"mobileIcon":399,"desktopIcon":404,"secondaryButton":407},{"text":395,"config":396},"Start free trial",{"href":397,"dataGaName":44,"dataGaLocation":398},"https://gitlab.com/-/trials/new/","nav",{"altText":400,"config":401},"Gitlab Icon",{"src":402,"dataGaName":403,"dataGaLocation":398},"https://res.cloudinary.com/about-gitlab-com/image/upload/v1758203874/jypbw1jx72aexsoohd7x.svg","gitlab icon",{"altText":400,"config":405},{"src":406,"dataGaName":403,"dataGaLocation":398},"https://res.cloudinary.com/about-gitlab-com/image/upload/v1758203875/gs4c8p8opsgvflgkswz9.svg",{"text":408,"config":409},"Get Started",{"href":410,"dataGaName":411,"dataGaLocation":398},"https://gitlab.com/-/trial_registrations/new?glm_source=about.gitlab.com/compare/gitlab-vs-github/","get started",{"freeTrial":413,"mobileIcon":418,"desktopIcon":420},{"text":414,"config":415},"Learn more about GitLab Duo",{"href":416,"dataGaName":417,"dataGaLocation":398},"/gitlab-duo/","gitlab duo",{"altText":400,"config":419},{"src":402,"dataGaName":403,"dataGaLocation":398},{"altText":400,"config":421},{"src":406,"dataGaName":403,"dataGaLocation":398},{"freeTrial":423,"mobileIcon":428,"desktopIcon":430},{"text":424,"config":425},"Back to pricing",{"href":181,"dataGaName":426,"dataGaLocation":398,"icon":427},"back to pricing","GoBack",{"altText":400,"config":429},{"src":402,"dataGaName":403,"dataGaLocation":398},{"altText":400,"config":431},{"src":406,"dataGaName":403,"dataGaLocation":398},{"title":433,"button":434,"config":439},"See how agentic AI transforms software delivery",{"text":435,"config":436},"Watch GitLab Transcend now",{"href":437,"dataGaName":438,"dataGaLocation":39},"/events/transcend/virtual/","transcend event",{"layout":440,"icon":441},"release","AiStar",{"data":443},{"text":444,"source":445,"edit":451,"contribute":456,"config":461,"items":466,"minimal":673},"Git is a trademark of Software Freedom Conservancy and our use of 'GitLab' is under license",{"text":446,"config":447},"View page source",{"href":448,"dataGaName":449,"dataGaLocation":450},"https://gitlab.com/gitlab-com/marketing/digital-experience/about-gitlab-com/","page source","footer",{"text":452,"config":453},"Edit this page",{"href":454,"dataGaName":455,"dataGaLocation":450},"https://gitlab.com/gitlab-com/marketing/digital-experience/about-gitlab-com/-/blob/main/content/","web ide",{"text":457,"config":458},"Please contribute",{"href":459,"dataGaName":460,"dataGaLocation":450},"https://gitlab.com/gitlab-com/marketing/digital-experience/about-gitlab-com/-/blob/main/CONTRIBUTING.md/","please contribute",{"twitter":462,"facebook":463,"youtube":464,"linkedin":465},"https://twitter.com/gitlab","https://www.facebook.com/gitlab","https://www.youtube.com/channel/UCnMGQ8QHMAnVIsI3xJrihhg","https://www.linkedin.com/company/gitlab-com",[467,514,568,612,639],{"title":179,"links":468,"subMenu":483},[469,473,478],{"text":470,"config":471},"View plans",{"href":181,"dataGaName":472,"dataGaLocation":450},"view plans",{"text":474,"config":475},"Why Premium?",{"href":476,"dataGaName":477,"dataGaLocation":450},"/pricing/premium/","why premium",{"text":479,"config":480},"Why Ultimate?",{"href":481,"dataGaName":482,"dataGaLocation":450},"/pricing/ultimate/","why ultimate",[484],{"title":485,"links":486},"Contact Us",[487,490,492,494,499,504,509],{"text":488,"config":489},"Contact sales",{"href":48,"dataGaName":49,"dataGaLocation":450},{"text":353,"config":491},{"href":355,"dataGaName":356,"dataGaLocation":450},{"text":358,"config":493},{"href":360,"dataGaName":361,"dataGaLocation":450},{"text":495,"config":496},"Status",{"href":497,"dataGaName":498,"dataGaLocation":450},"https://status.gitlab.com/","status",{"text":500,"config":501},"Terms of use",{"href":502,"dataGaName":503,"dataGaLocation":450},"/terms/","terms of use",{"text":505,"config":506},"Privacy statement",{"href":507,"dataGaName":508,"dataGaLocation":450},"/privacy/","privacy statement",{"text":510,"config":511},"Cookie preferences",{"dataGaName":512,"dataGaLocation":450,"id":513,"isOneTrustButton":24},"cookie preferences","ot-sdk-btn",{"title":84,"links":515,"subMenu":524},[516,520],{"text":517,"config":518},"DevSecOps platform",{"href":66,"dataGaName":519,"dataGaLocation":450},"devsecops platform",{"text":521,"config":522},"AI-Assisted Development",{"href":416,"dataGaName":523,"dataGaLocation":450},"ai-assisted development",[525],{"title":526,"links":527},"Topics",[528,533,538,543,548,553,558,563],{"text":529,"config":530},"CICD",{"href":531,"dataGaName":532,"dataGaLocation":450},"/topics/ci-cd/","cicd",{"text":534,"config":535},"GitOps",{"href":536,"dataGaName":537,"dataGaLocation":450},"/topics/gitops/","gitops",{"text":539,"config":540},"DevOps",{"href":541,"dataGaName":542,"dataGaLocation":450},"/topics/devops/","devops",{"text":544,"config":545},"Version Control",{"href":546,"dataGaName":547,"dataGaLocation":450},"/topics/version-control/","version control",{"text":549,"config":550},"DevSecOps",{"href":551,"dataGaName":552,"dataGaLocation":450},"/topics/devsecops/","devsecops",{"text":554,"config":555},"Cloud Native",{"href":556,"dataGaName":557,"dataGaLocation":450},"/topics/cloud-native/","cloud native",{"text":559,"config":560},"AI for Coding",{"href":561,"dataGaName":562,"dataGaLocation":450},"/topics/devops/ai-for-coding/","ai for coding",{"text":564,"config":565},"Agentic AI",{"href":566,"dataGaName":567,"dataGaLocation":450},"/topics/agentic-ai/","agentic ai",{"title":569,"links":570},"Solutions",[571,573,575,580,584,587,591,594,596,599,602,607],{"text":126,"config":572},{"href":121,"dataGaName":126,"dataGaLocation":450},{"text":115,"config":574},{"href":98,"dataGaName":99,"dataGaLocation":450},{"text":576,"config":577},"Agile development",{"href":578,"dataGaName":579,"dataGaLocation":450},"/solutions/agile-delivery/","agile delivery",{"text":581,"config":582},"SCM",{"href":111,"dataGaName":583,"dataGaLocation":450},"source code management",{"text":529,"config":585},{"href":104,"dataGaName":586,"dataGaLocation":450},"continuous integration & delivery",{"text":588,"config":589},"Value stream management",{"href":154,"dataGaName":590,"dataGaLocation":450},"value stream management",{"text":534,"config":592},{"href":593,"dataGaName":537,"dataGaLocation":450},"/solutions/gitops/",{"text":164,"config":595},{"href":166,"dataGaName":167,"dataGaLocation":450},{"text":597,"config":598},"Small business",{"href":171,"dataGaName":172,"dataGaLocation":450},{"text":600,"config":601},"Public sector",{"href":176,"dataGaName":177,"dataGaLocation":450},{"text":603,"config":604},"Education",{"href":605,"dataGaName":606,"dataGaLocation":450},"/solutions/education/","education",{"text":608,"config":609},"Financial services",{"href":610,"dataGaName":611,"dataGaLocation":450},"/solutions/finance/","financial services",{"title":184,"links":613},[614,616,618,620,623,625,627,629,631,633,635,637],{"text":196,"config":615},{"href":198,"dataGaName":199,"dataGaLocation":450},{"text":201,"config":617},{"href":203,"dataGaName":204,"dataGaLocation":450},{"text":206,"config":619},{"href":208,"dataGaName":209,"dataGaLocation":450},{"text":211,"config":621},{"href":213,"dataGaName":622,"dataGaLocation":450},"docs",{"text":234,"config":624},{"href":236,"dataGaName":237,"dataGaLocation":450},{"text":229,"config":626},{"href":231,"dataGaName":232,"dataGaLocation":450},{"text":239,"config":628},{"href":241,"dataGaName":242,"dataGaLocation":450},{"text":247,"config":630},{"href":249,"dataGaName":250,"dataGaLocation":450},{"text":252,"config":632},{"href":254,"dataGaName":255,"dataGaLocation":450},{"text":257,"config":634},{"href":259,"dataGaName":260,"dataGaLocation":450},{"text":262,"config":636},{"href":264,"dataGaName":265,"dataGaLocation":450},{"text":267,"config":638},{"href":269,"dataGaName":270,"dataGaLocation":450},{"title":285,"links":640},[641,643,645,647,649,651,653,657,662,664,666,668],{"text":291,"config":642},{"href":293,"dataGaName":9,"dataGaLocation":450},{"text":296,"config":644},{"href":298,"dataGaName":299,"dataGaLocation":450},{"text":304,"config":646},{"href":306,"dataGaName":307,"dataGaLocation":450},{"text":309,"config":648},{"href":311,"dataGaName":312,"dataGaLocation":450},{"text":314,"config":650},{"href":316,"dataGaName":317,"dataGaLocation":450},{"text":319,"config":652},{"href":321,"dataGaName":322,"dataGaLocation":450},{"text":654,"config":655},"Sustainability",{"href":656,"dataGaName":654,"dataGaLocation":450},"/sustainability/",{"text":658,"config":659},"Diversity, inclusion and belonging (DIB)",{"href":660,"dataGaName":661,"dataGaLocation":450},"/diversity-inclusion-belonging/","Diversity, inclusion and belonging",{"text":324,"config":663},{"href":326,"dataGaName":327,"dataGaLocation":450},{"text":334,"config":665},{"href":336,"dataGaName":337,"dataGaLocation":450},{"text":339,"config":667},{"href":341,"dataGaName":342,"dataGaLocation":450},{"text":669,"config":670},"Modern Slavery Transparency Statement",{"href":671,"dataGaName":672,"dataGaLocation":450},"https://handbook.gitlab.com/handbook/legal/modern-slavery-act-transparency-statement/","modern slavery transparency statement",{"items":674},[675,678,681],{"text":676,"config":677},"Terms",{"href":502,"dataGaName":503,"dataGaLocation":450},{"text":679,"config":680},"Cookies",{"dataGaName":512,"dataGaLocation":450,"id":513,"isOneTrustButton":24},{"text":682,"config":683},"Privacy",{"href":507,"dataGaName":508,"dataGaLocation":450},[685],{"id":686,"title":687,"body":8,"config":688,"content":690,"description":8,"extension":22,"meta":694,"navigation":24,"path":695,"seo":696,"stem":697,"__hash__":698},"blogAuthors/en-us/blog/authors/sean-mcgivern.yml","Sean Mcgivern",{"template":689},"BlogAuthor",{"name":18,"config":691},{"headshot":692,"ctfId":693},"https://res.cloudinary.com/about-gitlab-com/image/upload/v1749659488/Blog/Author%20Headshots/gitlab-logo-extra-whitespace.png","Sean-McGivern",{},"/en-us/blog/authors/sean-mcgivern",{},"en-us/blog/authors/sean-mcgivern","XSLkuLncc0pKQoZdVKdAEaieWRiQ6dWRrY0c8bNtvWw",[700,713,724],{"content":701,"config":711},{"title":702,"description":703,"authors":704,"heroImage":706,"date":707,"body":708,"category":9,"tags":709,"updatedDate":707},"GitLab names Bill Staples as new CEO","Co-founder Sid Sijbrandij transitions to Executive Chair of the Board.",[705],"Sid Sijbrandij","https://res.cloudinary.com/about-gitlab-com/image/upload/v1749665388/Blog/Hero%20Images/Revised2.png","2024-12-05","__This message from Sid Sijbrandij and Bill Staples was shared with GitLab team members earlier today.__ \n\n__Sid:__ On today’s earnings call, I announced that I am stepping down as CEO and will remain Executive Chair of the Board. I also introduced GitLab’s new CEO, [Bill Staples](https://www.linkedin.com/in/williamstaples/). \n\nAs a Board, we routinely do succession planning. This includes conversations with a number of top executives. We’ve been having these conversations in greater earnest since my cancer returned. Through these discussions, we identified someone uniquely qualified to lead GitLab. I want more time to focus on my cancer treatment and health. My treatments are going well, my cancer is not metastatic, and I'm working towards making a full recovery. Stepping down from a role that I love is not easy, but I believe that it is the right decision for GitLab.\n\nI couldn't be more excited to introduce you to Bill Staples, who will be leading GitLab into its next chapter. Bill will be GitLab’s CEO, effective today. He will also join the GitLab Board as a Director. Bill was most recently a public company CEO at New Relic. During his time there, he significantly increased the value of the company by accelerating revenue and driving increased profitability. He also brings decades of experience in leadership roles at Adobe and Microsoft. When I began speaking with Bill, I was immediately drawn to his customer-centric approach and deep product expertise. As I got to know him further, I knew that his shared value system made him the right person for this role, for our team members, for our customers, and for our shareholders. I feel fortunate that GitLab has found someone with a great leadership track record and strong DevOps expertise to lead GitLab into the future.\n\nWe have come so far from the early days when we launched GitLab.com. We have created the DevOps category and are the leader in the Gartner Magic Quadrant for both vision and execution. Millions of people now use GitLab to deliver software faster and more efficiently. We have integrated AI, Security, and Compliance into our platform to offer our enterprise customers the strongest AI-powered DevSecOps solution. We have also built GitLab in collaboration with our contributors. Last quarter, we had an all-time high of an estimated 1,800 code contributions from the wider community. It is incredible that as GitLab grew, our contributor community grew with us. We have done all of this while being a values-driven company, leading in all-remote work, championing transparency through our public handbook and culture, and co-creating with the wider community.\n\nI feel many things today, but more than anything else, I am grateful. I want to thank our customers. Driving results for them has been at the core of GitLab’s values, and I greatly appreciate their trust in us. I want to thank the wider GitLab community for their trust and enthusiasm. Their tens of thousands of contributions have greatly enhanced GitLab and its value for all users. Thank you, GitLab team members. Your contributions are at the core of GitLab’s success and the value we drive for our customers. Thank you, E-Group. You are amazing partners and collaborators in leading GitLab and our team members to achieve our very best. Thank you, GitLab Board. I have appreciated your support throughout my time as CEO and look forward to our ongoing partnership as I continue to serve as Executive Chair. And, thank you, Bill. I am excited for you to lead our next phase of growth. I am here to support you and the company in GitLab’s next chapter!\n\nI couldn't be more thrilled about Bill and what's ahead for GitLab with him at the helm. We have an incredible opportunity in front of us. Software has never mattered more, and GitLab is well-positioned to be the platform that best enables folks to create, secure, and operate it. I look forward to staying part of the company and being actively involved wherever Bill can use me. \n\n__Bill:__ Thanks, Sid, for the warm welcome! I greatly admire you and what you have accomplished. Very few people in the world have built a $10B market-cap technology company, taken it public, and scaled it to $750M in run-rate revenue. You have done incredible things with GitLab, and I’m grateful you will continue to play a meaningful role in the company. I appreciate your trust in me and commit to building upon the successes you and others should rightfully celebrate. \n\nI am so excited about GitLab and the opportunity ahead of us. Over the coming decade, we will see software-driven transformation around the world as AI accelerates and transforms the software revolution already in motion. GitLab and our mission are going to be more important than ever. I look forward to working with this team to scale GitLab well beyond where it is today.\n",[710],"news",{"slug":712,"featured":24,"template":13},"gitlab-names-bill-staples-as-new-ceo",{"content":714,"config":722},{"title":715,"description":716,"authors":717,"heroImage":719,"date":720,"body":721,"category":9},"Our Privacy Policy has been updated","Our updated Privacy Policy clarifies our existing data processing activities.",[718],"GitLab","https://res.cloudinary.com/about-gitlab-com/image/upload/v1749664472/Blog/Hero%20Images/gitlabflatlogomap.png","2023-06-14","As part of our commitment to keeping our policies current, we made some updates to our [Privacy Policy](/privacy/) on June 14, 2022.  These updates are intended to clarify our existing data processing activities and to provide information on processing that may derive from new features.  Through this update, we continue to provide transparency to our data processing activities, in line with an evolving privacy landscape.  Specifically, these policy updates include the following:\n\n- Clarification about which processing activities apply to each respective GitLab product;\n- Information about when personal data may be collected to verify someone’s identity to enable certain product features;\n- Clarification about what personal data is collected to provide a license and maintain a subscription; \n- Additional information regarding our Service Usage data collection practices, and the inclusion of certain processing activities, such as Event Analytics and Call Recordings;\n- Additional information regarding the purposes for which personal data is collected;\n- Minor updates regarding our legal basis for processing your personal data in the European Union; \n- Updates to our data retention practices for inactive accounts; \n- Clarification about how to delete your personal data at GitLab and how deletion is effectuated for public projects; \n- An additional notice that details our processing and your rights under the California Consumer Privacy Act, including CCPA metrics reporting;\n\nOverall, we believe that these updates will empower our users to make informed decisions about their personal data.  Please visit the complete text of our Privacy Policy and [Cookie Policy](/privacy/cookies/) to learn more about how GitLab processes personal data and your rights and choices regarding such processing.\n",{"slug":723,"featured":12,"template":13},"our-privacy-policy-has-been-updated",{"content":725,"config":736},{"title":726,"description":727,"authors":728,"heroImage":730,"date":731,"body":732,"category":9,"tags":733},"Rate limitations for unauthorized users of the Projects List API","Learn details about upcoming changes for unauthenticated users of the Projects List API.",[729],"Christina Lohr","https://res.cloudinary.com/about-gitlab-com/image/upload/v1749664087/Blog/Hero%20Images/tanukicover.jpg","2023-04-10","\n\nStarting on May 22 for self-managed GitLab, and May 8 for GitLab.com, unauthenticated users will be subject to rate limitations when using the Projects List API. This change has been made to ensure the stability and reliability of our platform for all users.\n\n**Note:** Authorized users are not affected by this change.\n\n## What is the the Projects List API?\n\nThe Projects List API provides information about GitLab projects, including name, description, and other metadata. This API is widely used by our community, including researchers, developers, and integrators, to retrieve and analyze information about GitLab projects. We value this usage and aim to support it as much as possible.\n\n## Rate limitation details\n\nIn recent months, we have observed that the frequency and intensity of requests made by unauthenticated, also known as anonymous, users to the Projects List API have increased significantly. This has resulted in an increased load on our servers, which has impacted the performance and stability of our platform for all users. To address this issue, we have decided to introduce rate limitations for unauthenticated users.\n\nAs a consequence of this change, unauthenticated users of the Projects List API will be limited to 400 requests per 10 minutes per unique IP address on GitLab.com. If an unauthenticated user exceeds this limit, the user will receive a \"429 Too Many Requests\" response. On GitLab.com, this limit cannot be changed. Users of self-managed GitLab instances have the same rate limitation set by default, but [admins can change the rate limits](https://docs.gitlab.com/ee/administration/settings/rate_limit_on_projects_api.html#rate-limit-on-projects-api) as they see fit via the UI or the application settings API. They can also set the rate limit to zero, which acts as if there is no rate limitation at all.\n\nWe understand that this change may impact some of our users who rely on the Projects List API, and we apologize for any inconvenience this may cause. We encourage users who need to make more than 400 requests per 10 minutes to the Projects List API to [sign up for a GitLab account](/pricing/), which provides higher rate limits and other benefits, such as access to additional APIs and integrations.\n\nIf you have any questions or concerns about this change, please do not hesitate to [leave feedback in this issue](https://gitlab.com/gitlab-org/gitlab/-/issues/404611).\n",[734,735,710],"product","features",{"slug":737,"featured":12,"template":13},"rate-limitation-for-unauthorized-users-projects-list-api",{"promotions":739},[740,754,765],{"id":741,"categories":742,"header":744,"text":745,"button":746,"image":751},"ai-modernization",[743],"ai-ml","Is AI achieving its promise at scale?","Quiz will take 5 minutes or less",{"text":747,"config":748},"Get your AI maturity score",{"href":749,"dataGaName":750,"dataGaLocation":237},"/assessments/ai-modernization-assessment/","modernization assessment",{"config":752},{"src":753},"https://res.cloudinary.com/about-gitlab-com/image/upload/v1772138786/qix0m7kwnd8x2fh1zq49.png",{"id":755,"categories":756,"header":757,"text":745,"button":758,"image":762},"devops-modernization",[734,552],"Are you just managing tools or shipping innovation?",{"text":759,"config":760},"Get your DevOps maturity score",{"href":761,"dataGaName":750,"dataGaLocation":237},"/assessments/devops-modernization-assessment/",{"config":763},{"src":764},"https://res.cloudinary.com/about-gitlab-com/image/upload/v1772138785/eg818fmakweyuznttgid.png",{"id":766,"categories":767,"header":769,"text":745,"button":770,"image":774},"security-modernization",[768],"security","Are you trading speed for security?",{"text":771,"config":772},"Get your security maturity score",{"href":773,"dataGaName":750,"dataGaLocation":237},"/assessments/security-modernization-assessment/",{"config":775},{"src":776},"https://res.cloudinary.com/about-gitlab-com/image/upload/v1772138786/p4pbqd9nnjejg5ds6mdk.png",{"header":778,"blurb":779,"button":780,"secondaryButton":785},"Start building faster today","See what your team can do with the intelligent orchestration platform for DevSecOps.\n",{"text":781,"config":782},"Get your free trial",{"href":783,"dataGaName":44,"dataGaLocation":784},"https://gitlab.com/-/trial_registrations/new?glm_content=default-saas-trial&glm_source=about.gitlab.com/","feature",{"text":488,"config":786},{"href":48,"dataGaName":49,"dataGaLocation":784},1772652082701]