How to ignore yml and config files while merging one branch to another

Mukul Rana

Hello Everyone,

I am facing this issue where when i merge my code from dev to stage pipeline , I get a merge conflict error on bitbucket-pipelines.yml and config.js. 

It is a requirement that these two files stay different in both pipelines as they contain configurations specific to them.

I have tried adding .gitignore file with entry of yml file and config.js directly into the repo through UI but that doesn't seem to help

I also tried applying .gitattributes by following this answer on stackoverflow: gitattributes 

but i still get the merge conflict.

 

Any help would be much appreciated.

Thanks in advanced!

 

 

Caroline R_g9ynyc

Hi, @Mukul Rana, welcome to the community! 

Before we start, I would like to further understand the configuration you have in your repository. Do you have 2 yml files under this repo? Also, when you say that you are facing an issue when you merge your code from dev to stage pipeline, is it triggering a default definition in your pipelines?

If that’s the case, you can actually have 1 YAML file under your repository and configure it to run specific sections for specific branches, this way, the names or expressions in this section are matched against branches in your Git repository. For example:

pipelines:
  default:
      - step:
          name: 'Build and Test'
          script:
            - echo "Your build and test goes here..."
  branches: #these will run on every push of the branch
    bug:
      - step: 
          script:
            - echo "I'm testing something here"

This document explains how to configure your bitbucket-pipelines.yml, in case you would like to take a look:

• https://support.atlassian.com/bitbucket-cloud/docs/configure-bitbucket-pipelinesyml/

Looking forward to hearing from you. 

Kind regards,
Caroline