How do I merge my own fork with updates from the main fork

[Chris Jones]

> On 24 Aug 2019, at 3:47 pm, Ryan Schmidt <ryandesign at macports.org> wrote:
> 
> 
> 
>> On Aug 24, 2019, at 07:55, Gerben Wierda wrote:
>> 
>> I have been trying to follow instructions but I am trying to prevent to have to become a git expert (there is insufficient time for that available, such as studying a whole git book). Just knowing some basic recipes for actions/steps lets me concentrate on the actual stuff I want to do that is potentially contributing to ports.
>> 
> 
> We have some help available here:
> 
> https://trac.macports.org/wiki/WorkingWithGit

Thanks, I forgot about that page.

Of course, there is also the man page at

https://git-man-page-generator.lokaltog.net/

;)

Chris
> 
> We needed a cheat sheet for people like you and me who don't have time to learn git, and other developers more familiar with git thankfully pitched in to write that. If it's missing anything you'd find helpful, please add it or suggest what should be added.
> 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macports.org/pipermail/macports-users/attachments/20190824/1b93c31f/attachment.html>