Re: Two master branches?

2018-01-22 Thread rahul gidwani
thanks Appy, that seemed to fix things... On Mon, Jan 22, 2018 at 11:53 AM, Apekshit Sharma wrote: > Done. Lemme know here if there are more issues related to this. > > On Mon, Jan 22, 2018 at 11:48 AM, Apekshit Sharma > wrote: > > > Both branches are

Re: Two master branches?

2018-01-22 Thread Apekshit Sharma
Done. Lemme know here if there are more issues related to this. On Mon, Jan 22, 2018 at 11:48 AM, Apekshit Sharma 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) →

Re: Two master branches?

2018-01-22 Thread Apekshit Sharma
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,

Re: Two master branches?

2018-01-22 Thread rahul gidwani
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 wrote: > When I did 'git pull' in workspace for master branch today, I got: > > error: Ref refs/remotes/origin/master is at >

Re: Two master branches?

2018-01-22 Thread Ted Yu
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 ->

Re: Two master branches?

2018-01-22 Thread Peter Somogyi
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

Re: Two master branches?

2018-01-19 Thread Stack
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 wrote: > I see following

Two master branches?

2018-01-19 Thread Apekshit Sharma
I see following three branches: remotes/apache/HEAD -> apache/master remotes/apache/Master remotes/apache/master Was "Master" always there? -- -- Appy