Bug 442284 - Support git merge.conflictstyle=diff3
Summary: Support git merge.conflictstyle=diff3
Status: RESOLVED FIXED
Alias: None
Product: JGit
Classification: Technology
Component: JGit (show other bugs)
Version: unspecified   Edit
Hardware: PC Mac OS X
: P3 enhancement with 4 votes (vote)
Target Milestone: 6.7   Edit
Assignee: Project Inbox CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2014-08-21 11:55 EDT by Helge Priva CLA
Modified: 2024-03-11 06:28 EDT (History)
8 users (show)

See Also:

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Helge Priva CLA 2014-08-21 11:55:21 EDT 

    


    


      



        
          Comment 1
        

        
          Eclipse Genie CLA

        

        
        

        
          2019-07-29 13:40:54 EDT
        

      






New Gerrit change created: https://git.eclipse.org/r/146745

    


    


      



        
          Comment 2
        

        
          Eclipse Genie CLA

        

        
        

        
          2019-07-29 13:40:56 EDT
        

      






New Gerrit change created: https://git.eclipse.org/r/146744

    


    


      



        
          Comment 3
        

        
          Eclipse Genie CLA

        

        
        

        
          2019-07-29 13:40:58 EDT
        

      






New Gerrit change created: https://git.eclipse.org/r/146743

    


    


      



        
          Comment 4
        

        
          Eclipse Genie CLA

        

        
        

        
          2019-07-29 13:41:01 EDT
        

      






New Gerrit change created: https://git.eclipse.org/r/146742

    


    


      



        
          Comment 5
        

        
          Eclipse Genie CLA

        

        
        

        
          2019-07-29 13:41:03 EDT
        

      






New Gerrit change created: https://git.eclipse.org/r/146748

    


    


      



        
          Comment 6
        

        
          Eclipse Genie CLA

        

        
        

        
          2019-08-24 15:11:26 EDT
        

      






New Gerrit change created: https://git.eclipse.org/r/148280

    


    


      



        
          Comment 7
        

        
          Stefan Lehmann CLA

        

        
        

        
          2020-09-09 13:47:14 EDT
        

      






Would love to see this feature merged.

    


    


      



        
          Comment 8
        

        
          Alfonso de la Vega CLA

        

        
        

        
          2021-03-05 05:21:55 EST
        

      






+1, I consider this a very useful feature (currently having to merge from terminal to have this conflict style)

    


    


      



        
          Comment 9
        

        
          Antonin Delpeuch CLA

        

        
        

        
          2024-03-10 15:47:24 EDT
        

      






I believe this bug should be closed, given that the following Gerrit change got merged and released:
https://git.eclipse.org/r/148280

    


    


      



        
          Comment 10
        

        
          Matthias Sohn CLA

        

        
        

        
          2024-03-11 06:27:55 EDT
        

      






merged as 462c57ec8d94b23e21479394ee7880e0fc1bb832

    


    


      



        
          Comment 11
        

        
          Matthias Sohn CLA

        

        
        

        
          2024-03-11 06:28:20 EDT
        

      






I meant https://git.eclipse.org/r/c/jgit/jgit/+/148280/ was merged as 462c57ec8d94b23e21479394ee7880e0fc1bb832