Le 13/12/13 10:34, Chris Brown a écrit :
On 12/13/13, 12:16 AM, Gavin Lambert wrote:
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@gmail.com> Date: Wed Dec 11 21:38:34 2013 -0800
mac thread_clock implementation
commit f5eb279eee0a28bc851abc24c41f293d95a71ba2 Author: Vicente J. Botet Escriba <vicente.botet@wanadoo.fr> 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?
Two extremely relevant links:
https://help.github.com/articles/merging-a-pull-request https://help.github.com/articles/checking-out-pull-requests-locally
So one process would be...
Check out the branch you're merging to in your local clone via `git checkout develop`. This is what I did.
Then apply the changes via `git pull https://github.com/ccbrown/chrono mac-thread-clock`. Assuming no conflicts, everything will be merged locally. If there are conflicts, git will complain and if they're non-trivial, the author of the pull request will need to resolve them.
If the patch looks good / passes tests, push it to the remote repository via `git push origin develop`. The problem is that I don't see nothing to push. git status don't shows any commit.
$ git reset --hard origin/develop HEAD is now at 824a12e Try to fix undefined int32_t with msvc $ git pull --no-commit https://github.com/ccbrown/chrono mac-thread-clock From https://github.com/ccbrown/chrono * branch mac-thread-clock -> FETCH_HEAD Updating 824a12e..143260d Fast-forward include/boost/chrono/config.hpp | 1 + .../chrono/detail/inlined/mac/thread_clock.hpp | 80 +++++++++++++++++++- 2 files changed, 79 insertions(+), 2 deletions(-) These are the two files that want to merge. There is no conflict. BTW, what does .../mean in .../chrono/detail/inlined/mac/thread_clock.hpp | 80 +++++++++++++++++++- ? $ git status # On branch develop # Your branch is ahead of 'origin/develop' by 1 commit. # # Untracked files: # (use "git add <file>..." to include in what will be committed) # # .gitignore nothing added to commit but untracked files present (use "git add" to track) $ git diff include/boost/chrono/config.hpp No difference Could I show something else that can be useful? Should I clone the full repository and start again? Thanks for your help, Vicente