After an evaluation, GNOME has moved from Bugzilla to GitLab. Learn more about GitLab.
No new issues can be reported in GNOME Bugzilla anymore.
To report an issue in a GNOME project, go to GNOME GitLab.
Do not go to GNOME Gitlab for: Bluefish, Doxygen, GnuCash, GStreamer, java-gnome, LDTP, NetworkManager, Tomboy.
Bug 663653 - Add -3 option for git am when using git apply
Add -3 option for git am when using git apply
Status: RESOLVED DUPLICATE of bug 657558
Product: git-bz
Classification: Other
Component: general
unspecified
Other Linux
: Normal normal
: ---
Assigned To: git-bz-maint
git-bz-maint
Depends on:
Blocks:
 
 
Reported: 2011-11-08 21:42 UTC by Luca Bruno
Modified: 2011-11-08 21:47 UTC
See Also:
GNOME target: ---
GNOME version: ---


Description Luca Bruno 2011-11-08 21:42:26 UTC 
Hello,
sometimes conflicts introduced by a patch are easily solvable with the three way merge, which is enabled with git am -3. I'd like to request this feature thus add -3 to the options passed to git am.
Comment 1 Owen Taylor 2011-11-08 21:47:04 UTC 

*** This bug has been marked as a duplicate of bug 657558 ***