Hello all,

I am working with a Jenkins server, and that server is automatically 
testing my PRs. As the repositories are private, we use a GitHub token that 
is associated with one of our users as a prefix to the URL. Here is a log 
(with tokens and URLs modified) of what I see for a given test. Note that 
this is with a public repo so that I can compare this output to what 
happens when we remove the token:

08:20:14  > git config remote.origin.url 
# timeout=10
08:20:14 Fetching upstream changes from 
08:20:14  > git --version # timeout=10
08:20:14  > git -c core.askpass=true fetch --tags --progress 
+refs/pull/*:refs/remotes/origin/pr/* --depth=1
08:20:19  > git rev-parse refs/remotes/origin/pr/17/merge^{commit} # 
08:20:19  > git rev-parse refs/remotes/origin/origin/pr/17/merge^{commit} # 
08:20:19 Merging Revision 21dc60cc02597bc685f555c37ce940d9bb7699a8 
(refs/remotes/origin/pr/17/merge) to origin/master, 
UserMergeOptions{mergeRemote='origin', mergeTarget='master', 
mergeStrategy='default', fastForwardMode='--ff'}
08:20:19  > git rev-parse origin/master^{commit} # timeout=10
08:20:19  > git config core.sparsecheckout # timeout=10
08:20:19  > git checkout -f origin/master
08:20:19  > git merge --ff 21dc60cc02597bc685f555c37ce940d9bb7699a8

The last line generates an add/add merge conflict. I have verified this by 
running all of these steps locally.

Now, if I instead remove the token from the URL, everything works 
perfectly, and the merge statement succeeds. Is there something obvious 
that I'm missing?



You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

Reply via email to