mirror/pcottle.learnGitBranching
1
0
Fork 0
mirror of https://github.com/pcottle/learnGitBranching.git synced 2025-06-26 07:58:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

awesome have part of git push working

Browse source
This commit is contained in:
Peter Cottle 2013-06-11 09:28:14 -07:00
parent 84f180e6a8
commit c7da989845
8 changed files with 336 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/js/intl/strings.js
View file

@ -60,6 +60,10 @@ exports.strings = {
'__desc__': 'One of the error messages for git',
'en_US': 'Your origin branch is out of sync with the remote branch and fetch cannot be performed. try using --force'
},
'git-error-origin-push-no-ff': {
'__desc__': 'One of the error messages for git',
'en_US': 'The remote repository has diverged from your local repository, so uploading your changes is not a simple fast forward (and thus your push was rejected). Please pull down the new changes in the remote repository, incorporate them into this branch, and try again. You can do so with git pull or git pull --rebase'
},
'git-error-remote-branch': {
'__desc__': 'One of the error messages for git',
'en_US': 'You cannot execute that command on a remote branch'