I am having Git merge troubles.
Rather than ask a question regarding the problems I'm running into, I would like to ask a question regarding how to interpret the arrows / branch histories when viewing the Git log using the "log" command in SmartGit.
Here are two screenshots of the SmartGit log.
The first is understandable to me, but I include it so that people reading this question see the context of the branches. This shows the current tip of the branches:
Here is a screenshot of the Git log, some time previous in the history:
I do not understand what is meant by the complex arrows in the above screenshot.
Here is what I do understand:
- The thin red and blue arrows represent the merge that has not yet been committed. I understand this.
Here is what I do not understand:
- What does the red arrow that points down represent? Why does it not join directly to the red line beneath it?
I may have other questions, depending on the answer to this first question. However, this is a sufficient question for me now.
Thanks!