On Fri, Apr 4, 2014 at 4:08 PM, Guy Harris <g...@alum.mit.edu> wrote: > > On Apr 4, 2014, at 9:21 AM, Herb Falk <h...@sisconet.com> <h...@sisconet.com> > wrote: > >> No, I just wanted to understand. It will be a couple of hours work. Tried >> to GIT clone and to add in my changes, but it didn't go well. > > > If you only want to keep your own private repository, with a modified version > of Wireshark that tracks the trunk (and with you being responsible for > dealing with merge conflicts), I'm not sure what the right way to do that is > in Git.
Keep a clone, and do your own work in a branch off master. When you want to update the underlying base, fetch from the master repository and rebase your branch on top of the latest master. > If you want to submit your changes to the Wireshark developers for > consideration for inclusion in mainline Wireshark, there should be > documentation in the developer's guide and/or the Wireshark Wiki for how to > set up support for using Gerrit. > > ___________________________________________________________________________ > Sent via: Wireshark-dev mailing list <wireshark-dev@wireshark.org> > Archives: http://www.wireshark.org/lists/wireshark-dev > Unsubscribe: https://wireshark.org/mailman/options/wireshark-dev > mailto:wireshark-dev-requ...@wireshark.org?subject=unsubscribe ___________________________________________________________________________ Sent via: Wireshark-dev mailing list <wireshark-dev@wireshark.org> Archives: http://www.wireshark.org/lists/wireshark-dev Unsubscribe: https://wireshark.org/mailman/options/wireshark-dev mailto:wireshark-dev-requ...@wireshark.org?subject=unsubscribe
