casweeney

Git Branch Merging Best Practices

1. After you've selected a feature to work on, create a branch in your local repo to build it in.
   • $ git checkout -b calaway/short_description_of_feature
2. Implement the requested feature, make sure all tests are passing, and commit all changes in the new branch.
3. Checkout the master branch locally.
   • $ git checkout master
4. Pull down the master branch from GitHub to get the most up to date changes from others. If you practice git workflow as described here you should never have a merge conflict at this step.
   • $ git pull origin master
5. Make sure all tests are passing on master and then checkout your new branch.

• $ git checkout calaway/short_description_of_feature

casweeney

import "./LibCast.sol";


contract Cast{
using Arithmetic for uint;
using Arithmetic for Arithmetic.Workers;
Arithmetic.Workers aw;

uint tem;

casweeney

uint256 constant SALARY=20000;

struct Workers{
    uint8 count;
    string name;
}
library Arithmetic{


function add(uint a,uint b) internal pure returns(uint){

casweeney

// SPDX-License-Identifier: MIT
pragma solidity ^0.8.13;

interface IERC721 {
    function safeTransferFrom(
        address from,
        address to,
        uint tokenId
    ) external;

casweeney

// SPDX-License-Identifier: MIT
pragma solidity ^0.8.13;


contract ByteCodeManager {
    function getBytecode(address _owner, uint _foo) public pure returns (bytes memory) {
        bytes memory bytecode = type(TestContract).creationCode;

        return abi.encodePacked(bytecode, abi.encode(_owner, _foo));
    }