git am - Apply a series of patches from a mailbox.
git am -3 patch : By default the command will try to detect the patch format automatically. This option allows the user to bypass the automatic detection and specify the patch format that the patch(es) should be interpreted as. Valid formats are mbox, mboxrd, stgit, stgit-series and hg.
( the -3 will do a three-way merge if there are conflicts )
git am --resolve : When a patch failure occurs, will be printed to the screen before exiting. This overrides the standard message informing you to use --continue or --skip to handle the failure. This is solely for internal use between git rebase and git am.
I hope this will help you !!!
For further actions, you may consider blocking this person and/or reporting abuse
We're a place where coders share, stay up-to-date and grow their careers.
git am -3 patch.mbox (In case of conflict, resolve the conflict and)git am --resolve
can you elaborate these?
Hey Amir,
Here, I've tried to elaborate your question,
git am - Apply a series of patches from a mailbox.
git am -3 patch : By default the command will try to detect the patch format automatically. This option allows the user to bypass the automatic detection and specify the patch format that the patch(es) should be interpreted as. Valid formats are mbox, mboxrd, stgit, stgit-series and hg.
( the -3 will do a three-way merge if there are conflicts )
git am --resolve : When a patch failure occurs, will be printed to the screen before exiting. This overrides the standard message informing you to use --continue or --skip to handle the failure. This is solely for internal use between git rebase and git am.
I hope this will help you !!!