Git Questions

[alinal]

Hi everyone,

Here's a list of questions for Fernando that have been compiled so far:

1. How to merge branches locally? (i.e. creating a branch and merging it into your own master branch)
2. Is it possible to push to your own master branch instead of creating a new branch?
3. How do you move forwards/ backwards in the code versions?
4. How do you pull automatically from your personal remote?
5. Workflow. Do we want to be able to push some things directly to silverlab/megavista?
6. Lab README

Please add anything I've left out!

Alina

[cgratton]

1. What is the email address in .gitconfig used for? We were trying to determine what email might be best to put in here for the shared computers.

You can edit the git config file in your own megavista folder:
git config user.name "John Doe"
git config user.email "John@doe"

[alinal]

1. Is there a way to follow other git repos within the megavista repo? I.e. Ariel's vista_utils.

git sub_modules- embedding one repo inside of another one.

However, this is really complicated and it's probably better to have a static copy of these files and update whenever the original repo gets updated.

[cgratton]

1. How do you resolve merge conflicts?