search

lhcb / second-analysis-steps

Level two LHCb data analysis lessons
https://lhcb.github.io/second-analysis-steps/
3 stars 20 forks source link

Add alternative way to resolve merge conflicts #34

Open saschastahl opened 8 years ago

alexpearce commented 8 years ago

This is much nicer. We could just update the instructions to use these commands. Best to specify only one way, particularly if there's one that's objectively better.

saschastahl commented 8 years ago

You mean just remove the other bullet point?

gdujany commented 8 years ago

mmm, not sure it is objectively better in all cases. I would claim that the first option is better If I have to checkout packages from different projects, especially if I intend to run locally some tests to see if the rebase did not break anything.

alexpearce commented 8 years ago

OK, then we should expand on this. It's important to be clear; I do git pull loads in non-LHCb projects, so it would be great to provide instructions how this works for LHCb.

gdujany commented 8 years ago

well, for my understanding now there is not a simple git lb-pull or a git lb-fetch but hopefully they will be there in the future so I guess it is fine to keep the links to the twiki in a challenge section now and hopefully update the section with simpler commands soon

saschastahl commented 8 years ago

I think you have to repeat git lb-use to pull upstream changes.

apuignav commented 7 years ago

Hi guys, do we have an update on this? What should we do with this PR?

alexpearce commented 7 years ago

There's still no way to effectively rebase an lb-dev project, so I think this is still relevant.