README.md

Magma git setup

Setup Development repo for new branch:

bash -c "$(curl -sL https://github.com/ShubhamTatvamasi/magma-git/raw/master/magma-git.sh)"

https://github.com/magma/magma/blob/master/.github/workflows/semantic-pr.yml#L59

---

cherry-pick a commit:

git show d1229589ed38c8ec385d2cbb2759168852af8d86

git fetch upstream
git checkout v1.8
git pull upstream v1.8

git checkout -b cherry-pick-updated-docker-install

git cherry-pick d1229589ed38c8ec385d2cbb2759168852af8d86

# if you see conflicts
git add .
git cherry-pick --continue

---

Add your personal remote repo as magma:

git remote add magma [email protected]:ShubhamTatvamasi/magma.git
git push magma operator-artifactory-push-fix

# For removing
git remote remove magma

• In short, the format is type(scope): Title, e.g. fix(agw): Fix pyroute2 dependency

Clone Magma repo:

git clone [email protected]:ShubhamTatvamasi/magma.git
cd magma

Change remote url:

git remote set-url origin [email protected]:ShubhamTatvamasi/magma.git

Set the remote upstream as follows:

git remote add upstream https://github.com/magma/magma.git

Check remote repos:

git remote -v

Update the master branch in your local copy of the upstream repository:

git pull --rebase upstream master

Now, switch back to your PR branch:

git checkout fix-spelling-errors

Rebase your changes against the main branch:

git rebase -i master

PRs cannot be merged without following this process. Use to -s or --signoff flag with your commit.

git commit -s

In the event that you push a commit without signing off, you can amend the commit and force push to update your branch and pull request.

git commit -s --amend --no-edit
git push --force

https://magma.github.io/magma/docs/next/contributing/contribute_workflow#guidelines