git - How do I create optional feature branches? -

i have forked open source project on github (https://github.com/alberthendriks/peatio/) , want offer functionality community. peatio currency exchange default supports cny , btc. now, there instructions add altcoins here: https://www.snip2code.com/snippet/205317/adding-a-new-cryptocurrency-to-peatio

i want create feature branch way multiple coins (one branch each coin), people can merge in coins want fork. issue is: think work if merge in 1 feature branch, if merge in multiple, there (unnecessary) conflict. there's code added multiple files each coin , order code each coin appears in file doesn't matter, git think it's conflict because code added @ same location. human should straightforward fix, there's automatic solution well?

well, if 1 pulls before adding own changes, there not conflicts. make sure before work has started, pull latest changes (that eliminate 90% of conflicts).

if you've pulled, started working, committed, pushed before did, you'll have conflicts. in case, you'll have pull again, fix merge conflicts, push changes.

git makes process painless, , who's contributing open source bound run merge conflict eventually.