feat: command to simulate Merge/Pull Request

[Magador]

• Adds git merge(M|P)R <source_branch> <target_branch> [--delete-after-merge] command to simulate a Merge/Pull Request being merged into the target branch
• The optional flag --delete-after-merge will remove the merged branch on the origin tree
  • The local remote branch remains as it is Git default behavior, even after git fetch (it would require git fetch --prune support to automatically prune remote tracking branches)
• You can push a branch with a deleted remote tracking branch on origin, the ref will just update.

Resolves #1057

Examples

Merging a feature branch feat into main on origin

git clone;
git switch -c feat;
git commit;
git push;
git fakeTeamwork;
git mergeMR feat main;

Merging a feature branch feat into main on origin when deleting it after merging

git clone;
git switch -c feat;
git commit;
git push;
git fakeTeamwork;
git mergeMR feat main --delete-after-merge;

If you git fetch after using git mergeMR, the ref o/feat will still exist because git fetch does not prune it by default:

git fetch;

You can re-push the local branch, re-creating a remote branch, and updating the ref o/feat:

git commit;
git push;

[netlify[bot]]

✅ Deploy Preview for xenodochial-hugle-b9ec84 ready!

Name	Link
🔨 Latest commit	acffcc1616b896463d226385f9d7f6e756cc88ec
🔍 Latest deploy log	https://app.netlify.com/sites/xenodochial-hugle-b9ec84/deploys/657c9f925cf72c0008088eba
😎 Deploy Preview	https://deploy-preview-1120--xenodochial-hugle-b9ec84.netlify.app/
📱 Preview on mobile	Toggle QR Code... Use your smartphone camera to open QR code link.

---

To edit notification comments on pull requests, go to your Netlify site configuration.

[pcottle]

Wow @Magador I really appreciate the contribution! You wrote tests and explained the small change in the git engine and thought about everything 🙌🏻

I'm not super familiar with these alternate workflows for merging features (at Instagram we all just merge into one main trunk branch) but sounds like you've thought about these a lot. I'll merge and push the site now with the updates 😎

[IT-VBFK]

Yeah :)

thanks @Magador

[HenryChan-Git]

that's good ! Where can i do this experiment ? I do not find this one in https://learngitbranching.js.org/?locale=zh_CN

[Magador]

that's good ! Where can i do this experiment ? I do not find this one in https://learngitbranching.js.org/?locale=zh_CN

You can simulate a merge using the sandbox and creating a remote repo :

git clone;
git switch -c feat;
git commit;
git push;
git fakeTeamwork;
git mergeMR feat main;

[HenryChan-Git]

yes, it works