Relative Content

Tag Archive for gitlab

Visual Studio, Git, and common code

I’m looking for some advice on how I should arrange a large new project I’m working on to allow it be more easily managed in Git (using GitLab), and developed in Visual Studio.

Visual Studio, Git, and common code

I’m looking for some advice on how I should arrange a large new project I’m working on to allow it be more easily managed in Git (using GitLab), and developed in Visual Studio.

How to compress GitLab pages with zstd?

GitLab doc gives examples of pre-compressing assets with gzip and brotli. Given the adoption of zstd by modern browsers, can we make GitLab Pages serve assets pre-compressed with zstd?

Comments and Changes Missing After Merging GitLab Merge Request

I recently encountered an issue while working with GitLab merge requests (MRs). Here’s the scenario: I reviewed an MR, added comments during the review process, and then merged the MR with those comments. However, after the successful merge, I noticed that the changes were not reflected in the main branch. Additionally, the default setting for MRs was to delete the source branch, but I could still see the branch existed.

Resolving gitlab conflicts locally

I created a branch conf_mr_1 and tried to create a Merge request which resulted in a conflict. This was intended just for some learning purpose. When I try and create a merge request gitlab gives me an option to resolve conflict locally. So I on my existing branch conf_mr_1 tried to execute the first 2 command as mentioned in step1 . While git fetch origin ran without issue, second one failed with error fatal: a branch named 'conf_mr_1' already exists which again is expected as branch conf_mr_1 already exist. Gitlab would not be definitely wrong 🙂 so I am wondering what am I doing wrong here ?