On Wed, Oct 31, 2007 at 01:40:11PM +1300, Sam Vilain wrote: > As Martin suggests you may just be able to get away with a merge.
This seems to be quite OK, and themos straightforward method. Thanks for this. > That will possibly leave you with a merge conflict. In that case, > git-mergetool, git-gui and gitk --merge are your friends. Get it the > way you want, and git-commit. Update the debian/changelog as you see > fit and commit again. All this is just perfect. I still have just one issue. Can I share the changelog across branches? I mean, can I separate the changelog alone into a separate branch, and merge it into master and experimental (a new branch) before the build? Thanks. Kumar -- Kumar Appaiah, 458, Jamuna Hostel, Indian Institute of Technology Madras, Chennai - 600 036 _______________________________________________ vcs-pkg mailing list [email protected] http://lists.madduck.net/listinfo/vcs-pkg
