Skip to content

Instantly share code, notes, and snippets.

@fluffynuts

fluffynuts/attempt-rcheckin-after-pull.txt

Last active February 9, 2016 09:17
Show Gist options
  • Save fluffynuts/b9420642684c17d3966d to your computer and use it in GitHub Desktop.
Save fluffynuts/b9420642684c17d3966d to your computer and use it in GitHub Desktop.
Download ZIP
attempt rcheckin after pull
Raw
attempt-rcheckin-after-pull.txt
C:\code\ix\P4StagingWA_git [master]> git status
On branch master
nothing to commit, working directory clean
C:\code\ix\P4StagingWA_git [master]> git tfs rcheckin
Working with tfs remote: default => $/P4StagingWA/DEV_Chilli_Projects
Basing from parent 'default:1681', use -i to override
Fetching changes from TFS to minimize possibility of late conflict...
error: latest TFS commit should be parent of commits being checked in
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment