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

DOC: NEW: How to test a branch #3264

Merged
merged 15 commits into from
Dec 19, 2024
Merged

DOC: NEW: How to test a branch #3264

merged 15 commits into from
Dec 19, 2024

Conversation

tlimoncelli
Copy link
Contributor

@tlimoncelli tlimoncelli commented Dec 18, 2024

Issue:

We frequently give instructions on how to test a branch from memory.

Resolution:

Document this on the website so we can send a link instead.

@cafferata
Copy link
Collaborator

I've prepared the feedback in a new branch cafferata/dnscontrol/tree/docs/test-a-branch-feedback. Would you like to pull it? Or should I prepare a new GitHub pull request?

@tlimoncelli
Copy link
Contributor Author

I've prepared the feedback in a new branch cafferata/dnscontrol/tree/docs/test-a-branch-feedback. Would you like to pull it? Or should I prepare a new GitHub pull request?

I am not that sophisticated in my Github knowledge :-(. Please walk me through what I should do (or create a github PR).

Thanks!

@cafferata
Copy link
Collaborator

cd dnscontrol
git checkout tlim_integr

Merge branch

git remote add cafferata [email protected]:cafferata/dnscontrol.git
git fetch cafferata docs/test-a-branch-feedback
git rebase cafferata/docs/test-a-branch-feedback --no-edit
git push

Clean-up

git remote remove cafferata

@tlimoncelli tlimoncelli merged commit 1a1e592 into main Dec 19, 2024
18 of 19 checks passed
@tlimoncelli tlimoncelli deleted the tlim_integr branch December 19, 2024 18:19
@tlimoncelli
Copy link
Contributor Author

Thanks for the tips!

Changes look excellent!

@cafferata
Copy link
Collaborator

cafferata commented Dec 19, 2024

I suspect something went wrong. Commit 6c0a4ab reverts the previous changes.

I've recreated these branch/GitHub pull request #3268

git checkout -B docs/test-a-branch-feedback
git cherry-pick 37cd87ff31b696fc598b95f90c9049de5e15250f
git cherry-pick da3c58b8468ab39d3aef2d1af186a084183b27ef
git cherry-pick 555f77da285f0c96faa694aac8c4dc0b940adc5a
git cherry-pick 57ad3cb308d8f3e2b689c1b8baad4f4a6ccde4d1
git cherry-pick 58423222dde59ce0d889a9ae7642b345a3df127a

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

Successfully merging this pull request may close these issues.

2 participants