Subject: Re: [boost] [chrono] mac thread_clock support
From: Gavin Lambert (gavinl_at_[hidden])
Date: 2013-12-13 03:16:57
On 13/12/2013 19:38, Quoth Vicente J. Botet Escriba:
> I have tried to pull this PR doing
> git pull https://github.com/ccbrown/chrono mac-thread-clock
> but when I do
> git status
> there is nothing on the stage
> However I see the merged files
> git log thread_clock.hpp
> commit 143260daeb2703961448a0928d199747ca34dfca
> Author: ccbrown <ccbrown112_at_[hidden]>
> Date: Wed Dec 11 21:38:34 2013 -0800
> mac thread_clock implementation
> commit f5eb279eee0a28bc851abc24c41f293d95a71ba2
> Author: Vicente J. Botet Escriba <vicente.botet_at_[hidden]>
> Date: Wed Jan 5 23:46:58 2011 +0000
> Boost.Chrono: Moved to trunk
> [SVN r67697]
> Could some one explain me what I did wrong?
By default, pull and merge in git will auto-commit if they don't see any
conflicts. You can tell them not to by using --no-commit.
(This isn't as scary as it sounds, since git also lets you "un-commit"
by using "git reset --soft HEAD^". Just try to do that sort of thing
only in your local repository -- it causes issues once it goes public.)
I could be wrong about this next part (since I haven't played too much
with this end of things myself) but I think the idea is that you "pull"
once you're happy with merging in the changes (and resolving any
conflicts that might arise) -- but before that, you merely
"switch/checkout" to test the changes (or otherwise review the patch,
eg. within GitHub, or by using "fetch" and then log/diff between HEAD
Boost list run by bdawes at acm.org, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk