[Agda-dev] Please use rebase when adding to stable-2.5

[Andreas Abel]

When working on new patches for the stable branch, please use rebase 
instead of merge to pull new changes from the upstream stable branch. 
This way your patches will "swim on top" and stay together.

When you are done, you can simply push to stable without creating a 
merge patch.  (Finally, merging into master will of course create a 
merge patch.)

For your working copy of the stable branch, set

   rebase = true

in .git/config.

Best,
Andreas


-- 
Andreas Abel  <><      Du bist der geliebte Mensch.

Department of Computer Science and Engineering
Chalmers and Gothenburg University, Sweden

andreas.abel at gu.se
http://www.cse.chalmers.se/~abela/