What branch are you working on? Usually I find that things work the best when I have some new branch that’s derived from . Then when I need to update my code for updates or because I’m about to put out a pull request it’s a simple matter of telling git to pull the latest changes from into my local branch, and merging those changes into my local branch. If the automatic merge succeeds (which it usually does) everything will be fine and dandy. Of course you have to have committed your changes onto the local branch first.
Or, in git commands:
[featurebranch +0 ~0 -0]$ git pull origin
[featurebranch +0 ~0 -0]$ git merge
It should just work if have the repository set up right and if Epic hasn’t pushed anything that conflicts with your code. If you have the repository set up wrong you might have to do some merging by hand to get things working. As you get more used to Git, you’ll have to do less of sort of thing.
If you have pushed on somewhere I’d definitely be interested in taking a look at it. My laptop definitely won’t be able to run , but my desktop probably can.