Git Feedback (Week 3/1)

[christianstanfield]

Hey Alberto,

One thing I noticed on your descriptions you listed pull as having the same effect as a fetch followed by a merge. I believe that's correct but I believe when you do it separately the way they have us doing it for DBC also allows you to review any possible commit conflicts between files, which doing a pull does not. I'm 99% sure that's correct but I haven't actually tried doing a pull. I'm not sure if you have or if you've encountered that?

I did also run into an issue with Git in the beginning of last week, I did the fetch & merge and ran into one of those conflicts where both I and DBC had separately edited the same file. I didn't find any info in the instructions on how to deal with it, but I somehow got to a GUI where I could see the differences and select between them. Hopefully that doesn't happen to you!