-
Notifications
You must be signed in to change notification settings - Fork 138
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Client admin #63
Client admin #63
Conversation
@TimPigden Can you rebase this against master? |
sorry I'm confused. I based my changes on these files and they are legitimate updates. I ran rebase master in my branch and it just tells me I'm up-to-date. I did a cosmetic change to force a new upload, but I'm not convinced that's enough. For the conflicting files we need to take the new version from here. Or should I merge my changes into updates master and do a new PR (git is not my speciality!) |
Switch back to master, run `git pull`, switch back to your branch and run `git rebase master`. Then `git push -f`.
…On 16 Nov 2019, 12:11 +0200, Tim Pigden ***@***.***>, wrote:
sorry I'm confused. I based my changes on these files and they are legitimate updates. I ran rebase master in my branch and it just tells me I'm up-to-date. I did a cosmetic change to force a new upload, but I'm not convinced that's enough. For the conflicting files we need to take the new version from here. Or should I merge my changes into updates master and do a new PR (git is not my speciality!)
—
You are receiving this because you commented.
Reply to this email directly, view it on GitHub, or unsubscribe.
|
```
tim@tim-home2:~/code/zio-kafka$ git checkout master
Switched to branch 'master'
Your branch is up-to-date with 'origin/master'.
tim@tim-home2:~/code/zio-kafka$ git pull
Already up-to-date.
tim@tim-home2:~/code/zio-kafka$ git checkout client-admin
Switched to branch 'client-admin'
Your branch is up-to-date with 'origin/client-admin'.
tim@tim-home2:~/code/zio-kafka$ git rebase master
Current branch client-admin is up to date.
tim@tim-home2:~/code/zio-kafka$ git push -f
Username for 'https://github.com': [email protected]
Password for 'https://[email protected]@github.com':
Everything up-to-date
tim@tim-home2:~/code/zio-kafka$
```
but it appears not to do anything
…On Sat, 16 Nov 2019 at 10:14, Itamar Ravid ***@***.***> wrote:
Switch back to master, run `git pull`, switch back to your branch and run
`git rebase master`. Then `git push -f`.
On 16 Nov 2019, 12:11 +0200, Tim Pigden ***@***.***>, wrote:
> sorry I'm confused. I based my changes on these files and they are
legitimate updates. I ran rebase master in my branch and it just tells me
I'm up-to-date. I did a cosmetic change to force a new upload, but I'm not
convinced that's enough. For the conflicting files we need to take the new
version from here. Or should I merge my changes into updates master and do
a new PR (git is not my speciality!)
> —
> You are receiving this because you commented.
> Reply to this email directly, view it on GitHub, or unsubscribe.
—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
<#63?email_source=notifications&email_token=AAJWHJ4SSU47DYDIGB3JHY3QT7BX5A5CNFSM4JMDXDZ2YY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOEEHOF2I#issuecomment-554623721>,
or unsubscribe
<https://github.com/notifications/unsubscribe-auth/AAJWHJYZSFCXZAIJ5EO2SC3QT7BX5ANCNFSM4JMDXDZQ>
.
--
Tim Pigden
Optrak Distribution Software Limited
+44 (0)1992 517100
http://www.linkedin.com/in/timpigden
http://optrak.com
Optrak Distribution Software Ltd is a limited company registered in England
and Wales.
Company Registration No. 2327613 Registered Offices: Suite 6,The Maltings,
Hoe Lane, Ware, SG12 9LR England
This email and any attachments to it may be confidential and are intended
solely for the use of the individual to whom it is addressed. Any views or
opinions expressed are solely those of the author and do not necessarily
represent those of Optrak Distribution Software Ltd. If you are not the
intended recipient of this email, you must neither take any action based
upon its contents, nor copy or show it to anyone. Please contact the sender
if you believe you have received this email in error.
|
Is |
|
|
I've looked for attempted fixes to local out of date but they just say use force - which I've already done. Everything else says "Already up-to-date" . |
@TimPigden You can create a new PR, but you'll still have to merge the changes in master to your branch. Otherwise you'll still have conflicts. Try doing the following:
|
shorter version just in case
|
git rebase masterMerge branch 'master' of https://github.com/zio/zio-kafka
…into client-admin
Superseded by #77 |
Added clientAdmin with tests. #62
Also started documentation and rearranged some tests pursuing possible bug (will raise issue)