Skip to content
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

Continuing #42 #47

Closed
wants to merge 20 commits into from
Closed

Continuing #42 #47

wants to merge 20 commits into from

Conversation

CodeWithShreyans
Copy link

I noticed that #42 creator was not responding so I tried my best to continue it. I'm not really a git pro so just check if everything's ok. Rebasing was giving this error:

From github.com:taganaka/SpeedTest
 * branch            master     -> FETCH_HEAD
Auto-merging SpeedTest.cpp
Auto-merging SpeedTest.h
CONFLICT (content): Merge conflict in SpeedTest.h
Auto-merging main.cpp
error: could not apply b6d4a8e... Increased precision for latency and jitter
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply b6d4a8e... Increased precision for latency and jitter

@CodeWithShreyans
Copy link
Author

I did a rebase in GitKraken and it said Rebase Successfull. Don't know if it actually worked

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants