Atom Editor Github Package - what are these icons for?

Multi tool use
Multi tool use












1















The Atom Editor has the Github package as standard. There is a nice documentation page. I've been using the package successfully for quite a while.



But what I cannot work out is just what these icons at locations A, B and C mean when merge conflicts occur.



atom github screenshot



B and C presumably relate to "mine" and "theirs". Which is which? What icons appear at B or C (sometimes they are different) and what do they mean? I hoped to be able to click one of them and choose 'use my file' or 'use their file', but I can't find that functionality anywhere. Does it exist?



And what icons can appear at location A? Can I click it to do something? Anything?










share|improve this question



























    1















    The Atom Editor has the Github package as standard. There is a nice documentation page. I've been using the package successfully for quite a while.



    But what I cannot work out is just what these icons at locations A, B and C mean when merge conflicts occur.



    atom github screenshot



    B and C presumably relate to "mine" and "theirs". Which is which? What icons appear at B or C (sometimes they are different) and what do they mean? I hoped to be able to click one of them and choose 'use my file' or 'use their file', but I can't find that functionality anywhere. Does it exist?



    And what icons can appear at location A? Can I click it to do something? Anything?










    share|improve this question

























      1












      1








      1








      The Atom Editor has the Github package as standard. There is a nice documentation page. I've been using the package successfully for quite a while.



      But what I cannot work out is just what these icons at locations A, B and C mean when merge conflicts occur.



      atom github screenshot



      B and C presumably relate to "mine" and "theirs". Which is which? What icons appear at B or C (sometimes they are different) and what do they mean? I hoped to be able to click one of them and choose 'use my file' or 'use their file', but I can't find that functionality anywhere. Does it exist?



      And what icons can appear at location A? Can I click it to do something? Anything?










      share|improve this question














      The Atom Editor has the Github package as standard. There is a nice documentation page. I've been using the package successfully for quite a while.



      But what I cannot work out is just what these icons at locations A, B and C mean when merge conflicts occur.



      atom github screenshot



      B and C presumably relate to "mine" and "theirs". Which is which? What icons appear at B or C (sometimes they are different) and what do they mean? I hoped to be able to click one of them and choose 'use my file' or 'use their file', but I can't find that functionality anywhere. Does it exist?



      And what icons can appear at location A? Can I click it to do something? Anything?







      github atom-editor






      share|improve this question













      share|improve this question











      share|improve this question




      share|improve this question










      asked Dec 31 '18 at 9:39









      emrys57emrys57

      4,97123037




      4,97123037
























          0






          active

          oldest

          votes











          Your Answer






          StackExchange.ifUsing("editor", function () {
          StackExchange.using("externalEditor", function () {
          StackExchange.using("snippets", function () {
          StackExchange.snippets.init();
          });
          });
          }, "code-snippets");

          StackExchange.ready(function() {
          var channelOptions = {
          tags: "".split(" "),
          id: "1"
          };
          initTagRenderer("".split(" "), "".split(" "), channelOptions);

          StackExchange.using("externalEditor", function() {
          // Have to fire editor after snippets, if snippets enabled
          if (StackExchange.settings.snippets.snippetsEnabled) {
          StackExchange.using("snippets", function() {
          createEditor();
          });
          }
          else {
          createEditor();
          }
          });

          function createEditor() {
          StackExchange.prepareEditor({
          heartbeatType: 'answer',
          autoActivateHeartbeat: false,
          convertImagesToLinks: true,
          noModals: true,
          showLowRepImageUploadWarning: true,
          reputationToPostImages: 10,
          bindNavPrevention: true,
          postfix: "",
          imageUploader: {
          brandingHtml: "Powered by u003ca class="icon-imgur-white" href="https://imgur.com/"u003eu003c/au003e",
          contentPolicyHtml: "User contributions licensed under u003ca href="https://creativecommons.org/licenses/by-sa/3.0/"u003ecc by-sa 3.0 with attribution requiredu003c/au003e u003ca href="https://stackoverflow.com/legal/content-policy"u003e(content policy)u003c/au003e",
          allowUrls: true
          },
          onDemand: true,
          discardSelector: ".discard-answer"
          ,immediatelyShowMarkdownHelp:true
          });


          }
          });














          draft saved

          draft discarded


















          StackExchange.ready(
          function () {
          StackExchange.openid.initPostLogin('.new-post-login', 'https%3a%2f%2fstackoverflow.com%2fquestions%2f53985889%2fatom-editor-github-package-what-are-these-icons-for%23new-answer', 'question_page');
          }
          );

          Post as a guest















          Required, but never shown

























          0






          active

          oldest

          votes








          0






          active

          oldest

          votes









          active

          oldest

          votes






          active

          oldest

          votes
















          draft saved

          draft discarded




















































          Thanks for contributing an answer to Stack Overflow!


          • Please be sure to answer the question. Provide details and share your research!

          But avoid



          • Asking for help, clarification, or responding to other answers.

          • Making statements based on opinion; back them up with references or personal experience.


          To learn more, see our tips on writing great answers.




          draft saved


          draft discarded














          StackExchange.ready(
          function () {
          StackExchange.openid.initPostLogin('.new-post-login', 'https%3a%2f%2fstackoverflow.com%2fquestions%2f53985889%2fatom-editor-github-package-what-are-these-icons-for%23new-answer', 'question_page');
          }
          );

          Post as a guest















          Required, but never shown





















































          Required, but never shown














          Required, but never shown












          Required, but never shown







          Required, but never shown

































          Required, but never shown














          Required, but never shown












          Required, but never shown







          Required, but never shown







          b99LcL0UtJVouG5qszCg6 iiFfUnqaBMBruEI9awDx1 sIkMU1PQfObQG uMFF0e,7HtitllV
          J,d4pNJe B7eLhttDMF,MYVJ4

          Popular posts from this blog

          Monofisismo

          Angular Downloading a file using contenturl with Basic Authentication

          Olmecas