git - Fast-forward merge two branches ignoring specific character pattern -

is there way merge commits other branches ignoring specific character pattern namespace/package using fast forward merge?

for example want merge few lines in

com.company.client1.custom  ...public class bicycle {  // bicycle class has // 3 fields public int cadence; public int gear; public int speed; } 

into banch have in file:

com.company.client2.custom  ...public class bicycle {  // bicycle class has // 3 fields public int cadence; public int gear; } 

i want merge last code line in snippet, don't want overwrite package way now.