"Simon A. Eugster" <simon...@gmail.com> writes: >> +... As the keeper of >> +the canonical history, you need to view the history from the remote >> +as `ours` (i.e. "our shared canonical history"), while what you did >> +on your side branch as `theirs` (i.e. "one contributor's work on top >> +of it"). >> >> -b <new_branch>:: >> Create a new branch named <new_branch> and start it at > > I think there is an “s” missing in “… and treat the work done on > the branch …”, but not quite sure.
Thanks, you are right. Will fix. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
