+ [2016-06-02T22:23:56Z] Bateramos remove the message
+ [2016-06-02T22:24:15Z] jhass so you could have just said "yes" to my question ;)
+ [2016-06-02T22:24:39Z] jhass run git rebase upstream/master and force push to your branch
+ [2016-06-02T22:25:50Z] Bateramos thx a lot, I will try this right away
+ [2016-06-02T22:44:39Z] Bateramos jhass, thanks a lot for the help! This solve my problem. I was really struggling with this for hours.

message no. 137923

Posted by Bateramos in #github at 2016-06-02T22:21:59Z

I updated my local repository with the changes in the main open source repository. Then pushed to my own fork. When I created a branch, the commit with the merge keep showing.
+ [2016-06-03T00:04:07Z] JnNy Hi, so I'm trying to do a git push, but didn't realize how big one of the files were, so the push failed. If I do git rm, I believe that will delete the files from my directory, which I don't want as I'm only pushing a few files. How can I remove this file from the list of files I did 'git add' for, without deleting the actual files?
+ [2016-06-03T01:02:01Z] JnNy Nevermind. I just started from scratch. I feel like there should be a way to do that though.
+ [2016-06-03T01:05:25Z] Spark hi, if I made a github repo by cloning a bitbucket mercurial repo, is it possible to then keep it synced?