Create
cancel
Showing results for 
Search instead for 
Did you mean: 
Sign up Log in

Next challenges

Recent achievements

Recognition

  • Give kudos
  • My kudos

Leaderboard

  • Global

Trophy case

Kudos (beta program)

Kudos logo

You've been invited into the Kudos (beta program) private group. Chat with others in the program, or give feedback to Atlassian.

View group

It's not the same without you

Join the community to find out what other Atlassian users are discussing, debating and creating.

Atlassian Community Hero Image Collage

Ignore some files during branch merging

Hi Git community, 

I have two branches master and develop. Each branch contains a same file named "db.config" having a seperate db credentials for production(master) and staging(develop).  

Master branch also have .gitattributes file in which i defined a merge=ours strategy for db.config file

.gitattributes

db.config merge=ours

When i merge develop into master branch by creating a pull request then changes in develop branch also goes to master after merge. It looks like .gitattributes doesnot work for me. 

Does anyone know how i get rid out of this? 

0 answers

Suggest an answer

Log in or Sign up to answer
TAGS
Community showcase
Asked in Atlassian Cloud Migration

To all Atlassian server champions - we want to hear from you

If you haven’t already read our recent announcement “ Accelerating our journey to the cloud, together ” and reviewed the related information that we added to our website , please start the...

7,451 views 247 40
View question

Community Events

Connect with like-minded Atlassian users at free events near you!

Find an event

Connect with like-minded Atlassian users at free events near you!

Unfortunately there are no Community Events near you at the moment.

Host an event

You're one step closer to meeting fellow Atlassian users at your local event. Learn more about Community Events

Events near you