jacensolo
January 16th, 2010, 06:16 AM
I am looking into using a Revision control system for my projects. The main one I have been looking at is Git. I downloaded it and started using it with a basic text file. I have a few questions about how it works.
1) I made a branch and changed a word in the text value. Then I changed into the master branch and did "git merge otherbranch". I was expecting it to ask me or say something about if i wanted the file/word changed, but it just overwrote the original word with the word from otherbranch. So what if I am working on a large project and I don't want some files to be merged, or maybe even parts of files to be merged? O is merging just copying branch1 into branch2?
2) Since git keeps a copy of the whole repository, what if I change something on my desktop and have something else changed on my laptop? How do I sync the changes?
Thanks for any help.
1) I made a branch and changed a word in the text value. Then I changed into the master branch and did "git merge otherbranch". I was expecting it to ask me or say something about if i wanted the file/word changed, but it just overwrote the original word with the word from otherbranch. So what if I am working on a large project and I don't want some files to be merged, or maybe even parts of files to be merged? O is merging just copying branch1 into branch2?
2) Since git keeps a copy of the whole repository, what if I change something on my desktop and have something else changed on my laptop? How do I sync the changes?
Thanks for any help.