On 2014-06-12 09:31, Michael Schnell wrote: > > could you check if this did work ?
Yes I can see your change. TIP: If you are tracking another repository, don't develop in the "master" branch. Leave that branch so it can track the upstream repository without causing any conflicts. Rather develop in a branch, and keep each feature or bugfix in a separate branch. That makes the upstream developers and your life much easier. You will then be able to keep your repository up to date with the official one (Github doesn't do that for you), and others can pull specific branches from you with whatever features they want in the official repo. Moving commits to a new branch is very easy. Afterwards you will have to reset your "master" branch to the last official commit, then do a forced push to update your Github repository. Regards, - Graeme - -- fpGUI Toolkit - a cross-platform GUI toolkit using Free Pascal http://fpgui.sourceforge.net/ -- _______________________________________________ Lazarus mailing list [email protected] http://lists.lazarus.freepascal.org/mailman/listinfo/lazarus
