Skip to content

Instantly share code, notes, and snippets.

Maintainers:
v3ntus: wazuh
sjdwhiting: wazuh
x86_64-linux wazuh
x86_64-linux tests.nixos-functions.nixos-test
aarch64-linux nixos-install-tools
x86_64-linux nixos-install-tools
@choco-bot
choco-bot / FilesSnapshot.xml
Created May 6, 2024 16:49
idris v1.1.1 - Passed - Package Tests Results
<?xml version="1.0" encoding="utf-8"?>
<fileSnapshot xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<files>
<file path="C:\ProgramData\chocolatey\lib\idris\idris-1.1.1-win64.7z.txt" checksum="46AF516A4A3C463816D7C8CFD28C8149" />
<file path="C:\ProgramData\chocolatey\lib\idris\idris.nupkg" checksum="980CC6370FBA4C9F764E9EC70BD372F2" />
<file path="C:\ProgramData\chocolatey\lib\idris\idris.nuspec" checksum="FDABED358BADF41433C22570F333B066" />
<file path="C:\ProgramData\chocolatey\lib\idris\tools\chocolateyInstall.ps1" checksum="58DD3DA1934EF68EDCCBB0DD508B3865" />
<file path="C:\ProgramData\chocolatey\lib\idris\tools\idris\idris-codegen-c.exe" checksum="8E532860C58A6FE934CA70B0DD88F150" />
<file path="C:\ProgramData\chocolatey\lib\idris\tools\idris\idris-codegen-javascript.exe" checksum="5C3D4A845F631B38884A8E26C16940E6" />
<file path="C:\ProgramData\chocolatey\lib\idris\tools\idris\idris-codegen-node.exe" checksum="EF6
use sqlx::{
database::HasArguments,
encode::{Encode, IsNull},
postgres::PgTypeInfo,
Database, Postgres, Type,
};
#[derive(Debug)]
pub struct PgArray2D<T>(pub Vec<Vec<T>>);

Merging Changes from Master into Your Branch: Rebase vs. Merge

When working on a project with multiple collaborators or branches, integrating changes from the main branch (often master) into your feature branch is a common task. Git offers two primary methods for this: rebase and merge. Both approaches achieve the same goal but have different implications for project history and workflow. Let's explore when to use each method and how to execute them.

Using rebase

Syntax:

git checkout custom_branch
git pull origin master
git rebase master
Maintainers:
markuskowa: hdf5-threadsafe, hdf5-mpi, hdf5-fortran, hdf5-fortran, hdf5, hdf5-fortran, hdf5-cpp, hdf5-mpi, hdf5-cpp, hdf5-fortran, hdf5-cpp, hdf5, hdf5-mpi, hdf5-threadsafe, hdf5-cpp, hdf5-mpi, hdf5-threadsafe, hdf5-threadsafe, hdf5, hdf5
x86_64-linux python312Packages.env-canada
aarch64-darwin python312Packages.dicom2nifti
aarch64-linux python312Packages.transformers
x86_64-darwin python312Packages.stanza
x86_64-linux python312Packages.safetensors
aarch64-darwin python311Packages.mne-python
x86_64-darwin python311Packages.webdataset
x86_64-linux python311Packages.spectral-cube
aarch64-darwin python312Packages.qcodes-contrib-drivers
aarch64-darwin khoj
  • repo -> repository

  • clone -> bring a repo down from the internet (remote repository like Github) to your local machine

  • add -> track your files and changes with Git

  • commit -> save your changes into Git

  • push -> push your changes to your remote repo on Github (or another website)

  • pull -> pull changes down from the remote repo to your local machine

  • status -> check to see which files are being tracked or need to be commited

  • init -> use this command inside of your project to turn it into a Git repository and start using Git with that codebase

Pytest

  • name must be test_[something].py
  • run via pyest
  • import files w/functions/methods to test:
    • from [filename] import [function] as [short name]

Example:

@choco-bot
choco-bot / FilesSnapshot.xml
Created May 6, 2024 16:48
wayback v0.19.1 - Passed - Package Tests Results
<?xml version="1.0" encoding="utf-8"?>
<fileSnapshot xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<files>
<file path="C:\ProgramData\chocolatey\lib\wayback\wayback-windows-amd64-0.19.1.zip.txt" checksum="B91192837AD0E010FF285DD84B4B449B" />
<file path="C:\ProgramData\chocolatey\lib\wayback\wayback.nupkg" checksum="3776D96290990A1A3AB1A34FEBB163E4" />
<file path="C:\ProgramData\chocolatey\lib\wayback\wayback.nuspec" checksum="D66876811363282DA7D01FDA5D8FDB1F" />
<file path="C:\ProgramData\chocolatey\lib\wayback\tools\CHANGELOG.md" checksum="720776069FBF20AFAC90C79CB977AA98" />
<file path="C:\ProgramData\chocolatey\lib\wayback\tools\chocolateyInstall.ps1" checksum="20F8C737CF980CE2ED206924F4481778" />
<file path="C:\ProgramData\chocolatey\lib\wayback\tools\LICENSE" checksum="1EBBD3E34237AF26DA5DC08A4E440464" />
<file path="C:\ProgramData\chocolatey\lib\wayback\tools\README.md" checksum="6BCEFB460E8C3723FA43070A74F5892F