Done. Lemme know here if there are more issues related to this. On Mon, Jan 22, 2018 at 11:48 AM, Apekshit Sharma <[email protected]> wrote:
> Both branches are same. > appy appy-MBP-3 ~/apache/hbase (master) → git log > apache/master..apache/Master > appy appy-MBP-3 ~/apache/hbase (master) → git log > apache/Master..apache/master > > Deleting "Master" branch. I just hope that there is no weird > case-sensitiveness issue which deletes both. > > On Mon, Jan 22, 2018 at 11:14 AM, rahul gidwani <[email protected]> > wrote: > >> I have the same issue that Peter has.... >> >> I assume the solution is re-clone like ted suggested. >> >> On Mon, Jan 22, 2018 at 10:41 AM, Ted Yu <[email protected]> wrote: >> >> > When I did 'git pull' in workspace for master branch today, I got: >> > >> > error: Ref refs/remotes/origin/master is at >> > 298dc0c626e3844d9a1551cc3e293f518277e89c but expected >> > d155a4e33d279bdf4b57b08ebc8220fe5d97f4cc >> > From https://git-wip-us.apache.org/repos/asf/hbase >> > ! d155a4e..9a45e0a master -> origin/master (unable to update >> local >> > ref) >> > >> > I have to re-clone workspace for master. >> > >> > FYI >> > >> > On Mon, Jan 22, 2018 at 1:10 AM, Peter Somogyi <[email protected]> >> > wrote: >> > >> > > Something is still not correct with the branches in the apache repo. >> > > After git pull the master branch points to f3c563fc00 but in log >> > > apache/master is still on 298dc0c626. The pull does the following all >> the >> > > time, working directory is clean. apache/Master also points to >> > 298dc0c626. >> > > >> > > $ git pull >> > > From https://github.com/apache/hbase >> > > 298dc0c626..f3c563fc00 master -> apache/master >> > > * [new branch] Master -> apache/Master >> > > Already up to date. >> > > >> > > $ git status >> > > On branch master >> > > Your branch is ahead of 'apache/master' by 7 commits. >> > > (use "git push" to publish your local commits) >> > > >> > > nothing to commit, working tree clean >> > > >> > > $ git lg >> > > * f3c563fc00 - (HEAD -> master) HBASE-19837 Flakey TestRegionLoad (2 >> > hours >> > > ago) <Michael Stack> >> > > * 27d00f5861 - HBASE-19794 TestZooKeeper hangs (20 hours ago) <Michael >> > > Stack> >> > > * 7fe4aa6fe4 - HBASE-19828 Flakey >> > > TestRegionsOnMasterOptions.testRegionsOnAllServers (2 days ago) >> <Michael >> > > Stack> >> > > * 11d6e6b1e6 - HBASE-19829 hadoop-minicluster pulls >> > > zookeeper:test-jar:tests 3.4.6 (2 days ago) <Artem Ervits> >> > > * 4bfdcaa3f3 - HBASE-19823 Make RawCellBuilderFactory >> > > LimitedPrivate.UNITTEST (2 days ago) <Apekshit Sharma> >> > > * 579586c697 - HBASE-19827 Addendum for Flakey TestAssignmentManager >> > Don't >> > > clear old location from RTP... (2 days ago) <Michael Stack> >> > > * c66b42fd9d - Revert "HBASE-19827 Addendum for Flakey >> > > TestAssignmentManager" Premature commit. (3 days ago) <Michael Stack> >> > > * 298dc0c626 - (apache/master) HBASE-19822 Override cancel(boolean) in >> > > LogCleaner (Addendum) (3 days ago) <Reid Chan> >> > > >> > > >> > > On Sat, Jan 20, 2018 at 7:50 AM, Stack <[email protected]> wrote: >> > > >> > > > Looks like Master was added a few days ago, by mistake is my guess: >> > > > https://github.com/apache/hbase/branches >> > > > >> > > > Kill it after ensuring master has all its commits? >> > > > >> > > > Shout if you want me to do it sir. >> > > > >> > > > S >> > > > >> > > > On Fri, Jan 19, 2018 at 2:50 PM, Apekshit Sharma <[email protected] >> > >> > > > wrote: >> > > > >> > > > > I see following three branches: >> > > > > remotes/apache/HEAD -> apache/master >> > > > > remotes/apache/Master >> > > > > remotes/apache/master >> > > > > >> > > > > Was "Master" always there? >> > > > > >> > > > > -- >> > > > > >> > > > > -- Appy >> > > > > >> > > > >> > > >> > >> > > > > -- > > -- Appy > -- -- Appy
