version control - git - merge two divergent branches ignoring some directories -


short story: want tell git ignore directory when merging. know git doesn't work way...

long story: have project deployed on 2 different platforms. every platform needs tweaks code deploy.

i have 2 branches, 1 every platform: platforma , platformb. 2 branches practically identical. difference in couple of files , directory needs present on 1 platform not on other. scenario:

platforma branch:  - dir1    - file1  - dir2    - file2  platformb branch:  - dir1    -file1

the problem appears when i'm working on platforma , make changes file1. want these changes available on platformb. problem when merge, git adds dir2 , file2 platformb.

i want able work on platformb , make changes file1 , able merge platforma without git removing dir2 , file2.

so question is: there way have 2 mergeable divergent branches? or there way tell git ignore directory/commit?

i have tried solution works when merging projectb->projecta, not other way around (git copies dir2 , file2 onto projectb).

also, think can cherry-pick every time, seems cumbersome , prone erros.

thanks in advance!

i recommend not use branches platform specific files. reorganize project platforms in single directory tree , common files present once.

like linux kernel - has arch directory platform-specific code, not bunch of branches.

what happens when need develop new feature that's larger 1 commit? create branches platforma-coolfeature , platformb-coolfeature? merge hell :)


-

Popular posts from this blog

html/hta mutiple file in audio player -

ok started coding .hta application , pretty html page .hta extension , adde mp3 player , did work <object data="test.mp3" type="audio/mp3" width="200" height="40"> <param name="src" value="test.mp3"> <param name="autostart" value="0"> </object> but it's 1 song playing again , again , plz there way add multiple files playlist believe it's should added "src" parameters not sure, i'm starting did add "," in between , , tried ";" none of them working i'm waiting answers :d i wanna know if can show me how become familiar tag see it's helpful , powerful activex, audio,video,pdf .... files i'm waiting impatiently [i don't know object, plz plz more clear] get inspired example hta_audio_player.hta <html> <head> <title>hackoo audio player playlist hackoo 2014</title> <hta:app...
Read more

debugging - Reference - What does this error mean in PHP? -

what this? this number of answers warnings, errors , notices might encounter while programming php , have no clue how fix. community wiki, invited participate in adding , maintaining list. why this? questions "headers sent" or "calling member of non-object" pop on stack overflow. root cause of questions same. answers questions typically repeat them , show op line change in his/her particular case. these answers not add value site because apply op's particular code. other users having same error can not read solution out of because localized. sad, because once understood root cause, fixing error trivial. hence, list tries explain solution in general way apply. what should here? if question has been marked duplicate of this, please find error message below , apply fix code. answers contain further links investigate in case shouldn't clear general answer alone. if want contribute, please add "favorite" error message, warning or notic...
Read more