Automatic merge ignore file list

Answered

I've been trying to use this grate Automatic merge build feature and was experiencing many conflicts because my branch (source branch ) has pom.xml versions entries different than the target master branch

Is there a workaround for this something maybe like ignore merge files that i can use ?

 

Gidi 

1 comment
Comment actions Permalink

Hi Gidi,

Currently it's not possible to ignore files when using Auto merge build feature. Please vote for the request: https://youtrack.jetbrains.com/issue/TW-47018.

0

Please sign in to leave a comment.