Manoj Srivastava <[EMAIL PROTECTED]> writes: > Well, I have seen this happen. > a) update the upstream branch (merge from remote/upstream, or > git_load_dirs). > b) Merge upstream branch into topic branches; resolve conflicts. > c) Merge topic branches into the integration branch (master, for > me). rerere applies any conflict resolution changes. Do any other > integration changes, and commit.
Rather than using rerere, I create a temporary merge branch based off upstream and merge each topic branch into it in sequence, and then merge the temporary merge branch into the integration branch, which seems to accomplish the same thing (not having to re-handle the merge conflicts when merging the first topic branch). Otherwise, I use the same approach. -- Russ Allbery ([EMAIL PROTECTED]) <http://www.eyrie.org/~eagle/> _______________________________________________ vcs-pkg-discuss mailing list firstname.lastname@example.org http://lists.alioth.debian.org/mailman/listinfo/vcs-pkg-discuss