so, you run git rebase master and get a conflict report. You fire up your preferred editor/IDE/whatever on the files that have conflicts, and you fix the c

so, you run git rebase master and get a conflict report. You fire up your preferred editor/IDE/whatever on the files that have conflicts, and you fix the conflicts, either by picking one of the versions (they will be marked sections delimited by <<<< and >>>>) or by manually merging the versions into a single new version. You save those files back to disk. Then you run git add ... list of files with conflicts that are now fixed ... and then you run git rebase continue You may have to repeat this process multiple times before the rebase can complete.