How to merge GitHub codes?

Question

How to merge GitHub codes?

Navigation

#1 by (0 votes)

0

I downloaded a project from GitHub, then made a change, another colleague of mine did the same thing with a single difference, he did a commit and updated the repository in GitHub. I needed to create a Branch and make a merge and then I made a git pull origin master

STS showed me some incoexistences, and it is possible to make comparisons of my changes with the code coming from the repository as you can see below.

Please, I would like to know if there is any feature in STS to be able to merge the two codes?

git spring-boot

asked by anonymous 28.11.2018 / 18:23

1 answer

C # Async / Await with an Invoke? xls created through C #, but does not add values

score 0 · Answer 1

It seems to me that he is already presenting a way to merge. You will have to merge the codes in the same hand, not always a merge scrolls smooth, without having to select what goes into your main branch.

I particularly use meld to do merge, it is good and independent of IDE. If you choose to merd or any other merge tool, you simply set it in .gitconfig or even by command.

# set up Meld as the default gui diff tool
$ git config --global  diff.guitool meld

# set the path to Meld
$ git config --global mergetool.meld.path C:/meld-1.6.0/Bin/meld.sh

Then just use the command below for example:

git merge origin/master

I hope I have helped