2011-01-07, 11:40
Is this the correct way to do it? I use TortoiseGIT but it helpfully shows the command it's using:
1. git.exe clone --progress -v "https://[email protected]/xbmc/xbmc.git" "D:\Dev\GIT\xbmc" to create a local copy of the repo. jhsrennie is my github username.
2. Make my changes
3. git commit to commit my changes to my local copy of the repo
4. git.exe push --progress "origin" master:master to push my changes up to the XBMC repository
Step 4 fails at the moment so am I doing this the correct way, and if so do I need to ask a member of the dev team to grant me push access?
http://wiki.xbmc.org/index.php?title=Git_Usage has blood curdling threats about "Never EVER force a push (non-fast-forward commit) to mainline". Can this be clarified for us git newbies? Is the problem overwriting code already pushed in by another dev? If so do you need to update your local archive then try again?
Finally the Git Usage article tells Linux/OSX users to update using git pull --rebase but doesn't mention Windows. Does this apply to Windows as well?
JR
1. git.exe clone --progress -v "https://[email protected]/xbmc/xbmc.git" "D:\Dev\GIT\xbmc" to create a local copy of the repo. jhsrennie is my github username.
2. Make my changes
3. git commit to commit my changes to my local copy of the repo
4. git.exe push --progress "origin" master:master to push my changes up to the XBMC repository
Step 4 fails at the moment so am I doing this the correct way, and if so do I need to ask a member of the dev team to grant me push access?
http://wiki.xbmc.org/index.php?title=Git_Usage has blood curdling threats about "Never EVER force a push (non-fast-forward commit) to mainline". Can this be clarified for us git newbies? Is the problem overwriting code already pushed in by another dev? If so do you need to update your local archive then try again?
Finally the Git Usage article tells Linux/OSX users to update using git pull --rebase but doesn't mention Windows. Does this apply to Windows as well?
JR