First off: my experience with GIT is minimal, but I know how it works (somewhat).
I'm using SmartGit as a GUI, but it's kind of confusing to me.
What I have now is a simple master repository with a branch in which I work. I want the changes in the master repository to merge into my branch, but that doesn't seem to happen somehow. Rebasing gives errors now, so I'm getting a bit frustrated :(
Can anyone help me out in this? Maybe that a different GUI could make things clearer for me?