Created
August 17, 2016 22:24
-
-
Save chaim1221/13d4bd639b7243101c3b86b5e574a90b to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
[SWDevTools] C:\tfs\git\rti-bridge> git branch --all | |
remotes/origin/develop | |
remotes/origin/master | |
[SWDevTools] C:\tfs\git\rti-bridge> git checkout develop | |
Branch develop set up to track remote branch develop from origin. | |
Switched to a new branch 'develop' | |
[SWDevTools] C:\tfs\git\rti-bridge> git status | |
On branch develop | |
Your branch is up-to-date with 'origin/develop'. | |
nothing to commit, working tree clean | |
[SWDevTools] C:\tfs\git\rti-bridge> git push origin | |
To http://pv-tfs:8080/tfs/DefaultCollection/VMS-Next/_git/rti-bridge | |
! [rejected] develop -> develop (fetch first) | |
error: failed to push some refs to 'http://pv-tfs:8080/tfs/DefaultCollection/VMS-Next/_git/rti-bridge' | |
hint: Updates were rejected because the remote contains work that you do | |
hint: not have locally. This is usually caused by another repository pushing | |
hint: to the same ref. You may want to first integrate the remote changes | |
hint: (e.g., 'git pull ...') before pushing again. | |
hint: See the 'Note about fast-forwards' in 'git push --help' for details. | |
[SWDevTools] C:\tfs\git\rti-bridge> git pull origin | |
remote: Microsoft (R) Visual Studio (R) Team Foundation Server | |
Unpacking objects: 100% (84/84), done. | |
From http://pv-tfs:8080/tfs/DefaultCollection/VMS-Next/_git/rti-bridge | |
670250a..5d6a8de develop -> origin/develop | |
* [new branch] codesmell -> origin/codesmell | |
Updating 670250a..5d6a8de | |
Fast-forward | |
IntegrationTests/packages.config | 8 -- | |
MonitorService/App.config | 2 +- | |
MonitorService/Configuration.cs | 12 --- | |
MonitorService/RtiBridgeListenerService.cs | 21 ++++- | |
MonitorService/RtiBridgeListenerService.csproj | 7 +- | |
MonitorService/RtiConfiguration.cs | 21 +++++ | |
RtiBridgeListener/Listener.cs | 4 - | |
UnitTests/SWAssert.cs | 31 +++++++ | |
UnitTests/UnitTests.csproj | 1 + | |
UnitTests/packages.config | 8 -- | |
inspections.DotSettings | 109 +++++++++++++++++++++++++ | |
11 files changed, 188 insertions(+), 36 deletions(-) | |
delete mode 100644 MonitorService/Configuration.cs | |
create mode 100644 MonitorService/RtiConfiguration.cs | |
create mode 100644 UnitTests/SWAssert.cs | |
create mode 100644 inspections.DotSettings | |
[SWDevTools] C:\tfs\git\rti-bridge> git push origin | |
Everything up-to-date |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment