more git questions (pulling, pushing, and merging)

[alinal]

1. Can you make a pull request to silverlab/megavista from a branch other than your master branch? Can you pull/push from different branches (i.e. push from username/megavista:otherbranch to silverlab/megavista:master)?
2. If you pull from silverlab/megavista will it delete all of your local changes?
3. What is the lab's preference about putting personal code on silverlab/megavista? I (Rachel) have put all my code into my repo in a folder called silverlab_tools/Rachel. Now I have some code that I want to make available to everyone, but I've realized that if I make a pull request from silverlab/megavista, it will bring all my code (including the Rachel folder) over into silverlab/megavista. Is that ok? If not, how can I push just the code I want onto silverlab/megavista?
4. How do you resolve merge conflicts?

Thanks!

Rachel and Alina