Missed Team ’24? Catch up on announcements here.

×
Create
cancel
Turn on suggestions
Auto-suggest helps you quickly narrow down your search results by suggesting possible matches as you type.
Showing results for 
Search instead for 
Did you mean: 
Sign up Log in
Products
See all
Community resources
Top groups
Explore all groups
Community resources
Learn
Community resources
Events
Community resources

Why when doing a merge with Pull Request .gitattributes properties are not taken into consideration?

Adam Bialas
Adam Bialas
I'm New Here
I'm New Here
Those new to the Atlassian Community have posted less than three times. Give them a warm welcome!
Get involved
November 7, 2017

Hi,

I am trying to set merge strategy for one file in .gitattributes so when merging to develop a file content is not changed (I added to .gitattributes file line: file_name merge=ours). It works locally but when I want to do a merge with pull request it does not.  Is there any way to enable it in bitbucket?

 

Adam

Answer
Watch
Like # people like this
506 views

0 answers

Suggest an answer

Log in or Sign up to answer
Bitbucket
Bitbucket
TAGS
AUG Leaders

Atlassian Community Events

    See all events