rahix/openflexure-microscope-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Apply suggestions from code review of branch picam-test-readme-update

Browse source 
Co-authored-by: Joe Knapper <joe.knapper@glasgow.ac.uk>
This commit is contained in:
Julian Stirling 2025-10-23 15:17:18 +00:00
parent ac1b6549e1
commit b1a70fd399
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
hardware-specific-tests/README.md
View file

@ -60,11 +60,11 @@ This ensures that:
### Keeping your branch up to date
One of the down sides of this form of testing is that if both the target and the source branch have changes to the to the camera files then the merged result will fail on CI. This is because the tests were not run against the merged result.
One of the downsides of this form of testing is that if both the target and the source branch have changes to the camera files, then the merged result will fail on CI. This is because the tests were not run against the merged result.
As such, any branches making camera changes need to kept in sync with their target branch. It is preferable to do this with rebasing, to prevent a very confusing series of merge commits.
To rebase your branch first make sure it is checked out by running (with BRANCH_NAME updated):
To rebase your branch, first make sure it is checked out by running (with BRANCH_NAME updated):
`git checkout BRANCH_NAME`
@ -76,7 +76,7 @@ Then run the rebase (assuming `v3` is the target branch):
`git rebase origin/v3`
**Note:** If both branches have update the zip you may have a `both modified` conflict on the zip itself. The best way to resolve this is to just use the original. You can do this by running the slightly confusing command of:
**Note:** If both branches have updated the zip, you may have a `both modified` conflict on the zip itself. The best way to resolve this is to just to use the file from the branch you are rebasing on. You can do this by running the slightly confusing command of:
`git checkout --ours -- picamera_coverage.zip`
@ -96,13 +96,13 @@ Once done you can push your rebased changes with:
Do **not** just run `git push` and then follow the instructions to first "pull". This can create a horrible mess.
**If you want to use a branch that has been reabsed on another computer.**
**If you want to use a branch that has been rebased on another computer.**
If you try to pull this branch on another computer that already had an older version checked out you will get a warning about the force push. In this case we want the servers history exactly and want to forget the history on this computer.
If you try to pull this branch on another computer that already had an older version checked out, you will get a warning about the force push. In this case, we want the server's history exactly and want to forget the history on that computer.
**First:** Check you have no unsaved work on this branch as we are about to delete it!!
**First:** Check you have no unsaved work on this branch, as we are about to delete it!
Then you can replace the local history by running (with BRANCH_NAME updated):
Then you can replace the local history by running (with BRANCH_NAME updated):
`git reset --hard origin/BRANCH_NAME`