Problems after using git to get develop branch of revo [SOLVED]

Quote from: BobRay at Nov 17, 2010, 03:09 PM

Quote from: OpenGeek at Nov 17, 2010, 12:00 AM

There should absolutely be no discussion of forking or upstream except in contributor documentation. The update/build from Git should be for user installation only.

Right, I suggested earlier that we need a separate group that just wants the current dev. version but won’t contribute -- "testers" ? They definitely need a separate page of instructions so their steps aren’t on the same page as the Contributors’ steps. I’d do it, but I don’t know how to create a new page.

Do you think they need to fetch and rebase also, or could they just pull? We don’t care about their history if they have no fork to push to.

They have one, Installing from Git; the contributor docs are separate.

If they change anything locally that is tracked in Git, yes, they will need to rebase or reset their HEAD before pulling; we don’t want them having to deal with conflicts.

If they’ve edited a tracked file that has been modified since their last update, they’ll get the same conflict with rebasing that they would get with pull.
Rebasing will change the order of the two relevant commits, but I don’t think it will change the fact that there’s a conflict.

I would advise them (as non-contributors) either to change a tracked file or to add it to the exclude list in .git/info/exclude. Then they won’t have any conflicts no matter what they do.

Sorry, I didn’t really mean to say conflicts; that is unavoidable and goes with the territory of changing core files, in any RCS. What rebasing vs. pulling will avoid is diverging from the upstream history, which can get really confusing and messy. You should always replay your changes on top of the latest upstream snapshot, which is what rebasing does. This keeps your history simple, clean, and in-sync with the project.

Avoiding conflicts by excluding things is not good IMO; that could easily lead to otherwise avoidable problems.

Good points. What do you think about having them alter the config file so git pull will automatically fetch and rebase in a single step?

Quote from: BobRay at Nov 19, 2010, 11:18 PM

Good points. What do you think about having them alter the config file so git pull will automatically fetch and rebase in a single step?

Might make a good note on the user page in the wiki if that is possible, though I have never messed with that. I prefer to know exactly what commands I am executing at all times, but, that’s me.

It’s definitely doable, but I’m not sure it’s supported in all git clients.

git pull --rebase is another one-step option that I’m pretty sure will work on any client.