Skip to content

Instantly share code, notes, and snippets.

@fluffynuts

fluffynuts/attempt-rcheckin-after-pull.txt

Last active February 9, 2016 09:17
Download ZIP

Revisions

  1. fluffynuts revised this gist Feb 9, 2016. 1 changed file with 0 additions and 2 deletions.
    2 changes: 0 additions & 2 deletions attempt-rcheckin-after-pull.txt
    View file
    Original file line number Diff line number Diff line change
    @@ -1,8 +1,6 @@
    C:\code\ix\P4StagingWA_git [master]> git status
    On branch master
    nothing to commit, working directory clean
    C:\code\ix\P4StagingWA_git [master]> git rcheckin
    git: 'rcheckin' is not a git command. See 'git --help'.
    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
  2. fluffynuts created this gist Feb 9, 2016.
    10 changes: 10 additions & 0 deletions attempt-rcheckin-after-pull.txt
    View file
    Original file line number Diff line number Diff line change
    @@ -0,0 +1,10 @@
    C:\code\ix\P4StagingWA_git [master]> git status
    On branch master
    nothing to commit, working directory clean
    C:\code\ix\P4StagingWA_git [master]> git rcheckin
    git: 'rcheckin' is not a git command. See 'git --help'.
    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