My partner and I have had problems properly operating the whole version control stuff. He is a bit more familiar than I am, yet I/we still have issues. I'll just handle my current predicament, see if you all can tell me how to fix my mess-ups, and how to avoid it in the first place.
So we have our own tasks we're working on of course. We are using Mercurial via TortoiseHG to connect with our BitBucket account. Starting from the same point, he commits one change to BitBucket, and then another. I get done with my work, locally commit my changes, and ask THG to pull down changes.
I end up with two lines in my THG graph now, my line and his(diverging from the last common version) which has two nodes on it.. I try to merge, but I just end up creating a spiderweb of red and blue. (It's late, I'm ignorant and frustrated, and at times like that my usual solution to square peg-round hole is a mallet. ...Not good, just saying....)
Why did this not do what I was expecting--namely, combine his changes with mine? How should I/we proceed in the future to avoid this? Is there an option I should have set to avoid this?
grrr....later I'll ask how I can fix it....
Edited by IndyOfComo, 07 October 2012 - 03:40 PM.