Stream: t-compiler/wg-meta

Topic: rolling up ice-breaker signups


Pietro Albini (Feb 07 2020 at 20:37, on Zulip):

dunno how @nikomatsakis did it, but I just wanted to post here the way I used to quickly merge a bunch of conflicting ice-breaker signup PRs, if someone else wants to take care of rolling them up:

  1. write * merge=union in .gitattributes
  2. run for pr in 224 227 228; do git fetch origin pull/$pr/head; git merge FETCH_HEAD -m "rollup merge of #$pr"; done
  3. remove the .gitattributes file
  4. run cargo run check and fix eventual merge errors
Pietro Albini (Feb 07 2020 at 20:38, on Zulip):

* merge=union inside .gitattributes tells git to ignore the usual merge strategy and just add both lines in the final output

Pietro Albini (Feb 07 2020 at 20:39, on Zulip):

which is wonderful if multiple people are adding themselves into the list, and horrible in possibly every other kind of merge conflict

Pietro Albini (Feb 07 2020 at 20:39, on Zulip):

so with that there are no merge conflicts to fix for every PR :D

nikomatsakis (Feb 13 2020 at 19:28, on Zulip):

heh :)

nikomatsakis (Feb 13 2020 at 19:28, on Zulip):

I just resolved the merge conflicts by hand

Santiago Pastorino (Feb 13 2020 at 19:30, on Zulip):

I also resolved them by hand :)

Last update: Sep 27 2020 at 13:15UTC