[git-users] GitHub: checkout data to origin, adding data to origin without merge

2013-04-15 Thread gocrowdpromo
have a remote repository and a local one. The local Git repository I also use in StarTeam. My task is to take files from Git origin, after check them out on StarTeam, and then add changes to Git origin. But, I'm not allowed to do any merge. So I can't use git pull. The stupid way is to

[git-users] GitHub: checkout data to origin, adding data to origin without merge

2013-04-15 Thread gocrowdpromo
I have a remote repository and a local one. The local Git repository I also use in StarTeam. My task is to take files from Git origin, after check them out on StarTeam, and then add changes to Git origin. But, I'm not allowed to do any merge. So I can't use git pull. The stupid way is to