All, I just had another "update (forced)" pull when I did "get fetch --all" on the master branch, followed by a failure to "git merge" onto my local master. As mentioned previously, my "master" branch is pristine, and should be unchanged from upstream "master". Is someone doing "rebase" on master? If so, can I cast a vote for "please don't"?
Phil Mayers wrote:
I just had another "update (forced)" pull when I did "get fetch --all" on the master branch, followed by a failure to "git merge" onto my local master.
When was your last pull?
As mentioned previously, my "master" branch is pristine, and should be unchanged from upstream "master".
Is someone doing "rebase" on master? If so, can I cast a vote for "please don't"?
I agree. I try to avoid forced pushes to master. Alan DeKok.
On 13/11/12 14:38, Alan DeKok wrote:
Phil Mayers wrote:
I just had another "update (forced)" pull when I did "get fetch --all" on the master branch, followed by a failure to "git merge" onto my local master.
When was your last pull?
Actually, looking closer at it I think I might have been unlucky and done a pull during the brief period on Oct 28th before Arran corrected the repo; so I had the "middle" stage as "master". So it's already "known". Sorry for the noise!
On 13/11/12 14:35, Phil Mayers wrote:
All,
I just had another "update (forced)" pull when I did "get fetch --all" on the master branch, followed by a failure to "git merge" onto my local master.
As mentioned previously, my "master" branch is pristine, and should be unchanged from upstream "master".
Is someone doing "rebase" on master? If so, can I cast a vote for "please don't"?
The offending commits seem to be: commit 3efb7720c9cc6e5a9b49459ae7bcfe6bf223fe73 Author: Chris Mikkelson <cmikk@qwest.net> Date: Wed Feb 8 13:14:11 2012 -0600 Handle tagged attributes with multiple values in rlm_perl. commit e2a40b6eeb09f7c816b9a6aa0b19325ce8594591 Author: Arran Cudbard-Bell <a.cudbardb@freeradius.org> Date: Sun Oct 28 11:47:46 2012 +0000 Add tag matching to pairdelete and paircopy2 ...which have changed in the upstream repo at some point. Maybe this was actually a result of last time?
participants (2)
-
Alan DeKok -
Phil Mayers