search

talaia-labs / rust-teos

The Eye of Satoshi - Lightning Watchtower
https://talaia.watch
MIT License
128 stars 62 forks source link

Add logging for data directory and config file paths #214

Closed anipaul2 closed 1 year ago

anipaul2 commented 1 year ago

Following up from #210

fixes: #202

sr-gi commented 1 year ago

You really didn't need to open another PR for this. You should just have to rebase the old one. Please do not do this, it makes it hard to follow the review process. It's the second time already that this happens for the same issue.

anipaul2 commented 1 year ago

You really didn't need to open another PR for this. You should just have to rebase the old one. Please do not do this, it makes it hard to follow the review process. It's the second time already that this happens for the same issue.

I actually didn't closed it by myself. It happened when I synced on my fork and it got deleted. I apologize for creating a new PR and making it difficult to follow the review process. I understand the importance of keeping the conversation and history in a single PR. In the future, I will make sure to rebase and fix any issues within the existing PR. Thank you for your feedback, and I will take it into account for future contributions.

anipaul2 commented 1 year ago

Fork repo says:-

image

But I have only pushed one commit and the other one gets attached automatically. I git logged and go through it but didn't found the second commit hash there so that I can reset. When I try to do rebase it shows my first commit only and second commit is not there. If it is there I can either drop or squash but it is not even present there.

image

How can I solve this issue?

anipaul2 commented 1 year ago

This is exactly what happened with my previous pr so I synced from my repo itself which resulted in pr closed. I never did intentionally. I don't know how to solve this. @sr-gi please if you could help regarding this it would really help me understand how this works as a whole.

sr-gi commented 1 year ago

You needed to first pull from upstream to get the new changes. Normally you'd do this on master, but you were already working on master instead of in a separate branch for this PR. After having your local master synced with upstream, you would need to rebase your branch with master, which may cause some merge issues that you'd need to deal with. After that you can force push.

anipaul2 commented 1 year ago

You needed to first pull from upstream to get the new changes. Normally you'd do this on master, but you were already working on master instead of in a separate branch for this PR. After having your local master synced with upstream, you would need to rebase your branch with master, which may cause some merge issues that you'd need to deal with. After that you can force push.

I did all of these but didn't work.

image

The second one here is not even committed by me. When I click on this commit it shows these:-

image

The extra commit hash is d698a26751ed39a56c6b859ad603c1bd0592bc82 which has two parents one from previous pr that got deleted and the other one is fix clippy responder one.

2 parents 4bde9ff + 886e0ff commit d698a26

I am not able to solve this and can do by making a new branch related to this issue and the cherry pick the first commit that I want to keep and then force push.

anipaul2 commented 1 year ago

When I remove the second commit (latest one) and point the head to the first one it says branch is outdated and fork becomes one commit ahead which I did and one commit behind which was from @sr-gi. When I sync it to match the upstream then the fork gets updated with two commits and shows two commits ahead. @mariocynicys @sr-gi I understand that you both are quite busy, and I truly appreciate any time and assistance you can provide to help me understand and resolve this issue.

mariocynicys commented 1 year ago

I'm not really following on the git issues you are facing @anipaul2, but I think you wanna give git book a read first as it gonna help your hands get moving with git. We don't have to rush on this PR for now.

sr-gi commented 1 year ago

I'm not following either at this point 🫤

anipaul2 commented 1 year ago

I'm not following either at this point 🫤

In summary I added and committed before fetching the upstream at first so that's why it became so confusing. And it cannot be resolved too in this branch. I have to raise another pr with another branch and not witih master then it will work. But, I guess I already raise two so if you agree I will do.

sr-gi commented 1 year ago

I'll fix it

anipaul2 commented 1 year ago

I'll fix it

I sincerely apologize for the inconvenience caused by the issues with my PR. I understand that it has made the review process more challenging, and I want to assure you that I will take the necessary steps to avoid this situation in the future.

sr-gi commented 1 year ago

There you go, your master is now up to date with upstream.

Pull that so your local master looks the same, then apply your commit on top (don´t worry if you delete your data, I saved your commit here: https://github.com/sr-gi/rust-teos/commit/16ff91aa51985d60eb29d59d8a3cf285dd5d344b).

Once you push your master with your new commit to your remote, this PR should reopen automatically.

anipaul2 commented 1 year ago

There you go, your master is now up to date with upstream.

Pull that so your local master looks the same, then apply your commit on top (don´t worry if you delete your data, I saved your commit here: sr-gi@16ff91a).

Once you push your master with your new commit to your remote, this PR should reopen automatically.

Should I delete the two local commits?

image

and then write the code again from the saved data as you said or cherry pick the commit and push it?

anipaul2 commented 1 year ago

I did git reset hard and local commits removed. Adding my codes from the data saved and will raise a pr soon.

anipaul2 commented 1 year ago

Following up from #210

fixes: #202

Thank you so much for the saved data! I pushed the commit but it doesn't reopens this pr and shows conflicts again so added manually and raised a pr again. I know raising pr three times for this simple issue makes the process of review very difficult that's why I tried my best but doing further research I got that my local commits have messed up totally and I have to raise a pr again. I am really sorry for the inconvenience caused and from next time I will not make the same mistake again.