>
> I'd say there's no need for pull or rebase.
>
> You should do this:
> git fetch $REPOSITORY

any reason for fetch instead of pull?

> git clean -x -d -f
> git reset --hard $REPOSITORY/$BRANCH
> [ apply changes ]
> git commit -m "Scripty changes" -a
> git push $REPOSITORY $BRANCH
>
> If the push fails, discard work and try again next time.

hrm. but I've been told that scripty takes 13-17 hours to run. what are the 
chances that a push will succeed 13 hours after the fetch/pull? (I guess it 
depends on how many desktop files there are and how often people change them?)

-- 
This message brought to you by eevil bananas and the number 3.
www.chani3.com

Attachment: signature.asc
Description: This is a digitally signed message part.

_______________________________________________
Kde-scm-interest mailing list
[email protected]
https://mail.kde.org/mailman/listinfo/kde-scm-interest

Reply via email to