Quantcast
Channel: User Mohamed Mufeed - Stack Overflow
Viewing all articles
Browse latest Browse all 37

Answer by Mohamed Mufeed for How do I merge 2 remote branches?

$
0
0

That is git’s way of saying there are differences in your commit history so both the differences would be merged together if you pull.

Depending on your work and workflow this could be huge or just few files.

While merging there may occur merge conflicts as well, if so you would have to review them and resolve the conflicts.

As for your question

you can enter the commit message on the window provided. That is a vim editor so

  • press a to go into append mode
  • enter the commit message there
  • press esc to exit the append mode
  • press wq ( write and quit )

Which will initiate the merge process

If there are no conflicts everything should go smoothly.


Viewing all articles
Browse latest Browse all 37

Trending Articles



<script src="https://jsc.adskeeper.com/r/s/rssing.com.1596347.js" async> </script>